diff --git a/src/routes/applications/[id]/__layout.svelte b/src/routes/applications/[id]/__layout.svelte
index 877d3620a..3662f289a 100644
--- a/src/routes/applications/[id]/__layout.svelte
+++ b/src/routes/applications/[id]/__layout.svelte
@@ -143,10 +143,18 @@
 		clearInterval(statusInterval);
 	});
 	onMount(async () => {
-		await getStatus();
-		statusInterval = setInterval(async () => {
+		if (!application.gitSourceId || !application.destinationDockerId || !application.fqdn) {
+			$status.application.initialLoading = false;
+			$status.application.isRunning = false;
+			$status.application.isExited = false;
+			$status.application.loading = false;
+			return;
+		} else {
 			await getStatus();
-		}, 1000);
+			statusInterval = setInterval(async () => {
+				await getStatus();
+			}, 1000);
+		}
 	});
 </script>