diff --git a/src/lib/helpers/buildTimeout.ts b/src/lib/helpers/buildTimeout.ts
index 724f82a6a..df10478ee 100644
--- a/src/lib/helpers/buildTimeout.ts
+++ b/src/lib/helpers/buildTimeout.ts
@@ -27,7 +27,6 @@ export function getEffectiveBuildStatus(
 ): string {
     const originalStatus = deployment.status;
     const createdAt = deployment.$createdAt;
-    const screenshots = [deployment.screenshotLight, deployment.screenshotDark];
 
     const timeoutSeconds = getBuildTimeoutSeconds(consoleVariables);
     if (isBuildTimedOut(createdAt, originalStatus, timeoutSeconds)) {
@@ -35,16 +34,7 @@ export function getEffectiveBuildStatus(
     }
 
     const isReady = originalStatus === 'ready';
-    let hasScreenshot = true;
-    if (screenshots.length === 0) {
-        hasScreenshot = false;
-    }
-    for (const screenshot of screenshots) {
-        if (!screenshot) {
-            hasScreenshot = false;
-            break;
-        }
-    }
+    const hasScreenshot = deployment.screenshotLight && deployment.screenshotDark;
 
     if (isReady && !hasScreenshot) {
         return 'finalizing';
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte
index aef47d86d..b41104e09 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte
@@ -26,6 +26,7 @@
         const timeoutCleanup = () => {
             if (skipScreenshotTimeout) {
                 clearTimeout(skipScreenshotTimeout);
+                skipScreenshotTimeout = null;
             }
         };
 
@@ -54,7 +55,11 @@
                     }
 
                     if (isReady && isFinished) {
-                        clearTimeout(skipScreenshotTimeout);
+                        if (skipScreenshotTimeout) {
+                            clearTimeout(skipScreenshotTimeout);
+                            skipScreenshotTimeout = null;
+                        }
+
                         goToFinishScreen();
                     }
                 }