diff --git a/apps/ui/src/routes/applications/[id]/__layout.svelte b/apps/ui/src/routes/applications/[id]/__layout.svelte
index 2cca44071..d6a01c466 100644
--- a/apps/ui/src/routes/applications/[id]/__layout.svelte
+++ b/apps/ui/src/routes/applications/[id]/__layout.svelte
@@ -20,7 +20,7 @@
 			if (!application || Object.entries(application).length === 0) {
 				return {
 					status: 302,
-					redirect: '/applications'
+					redirect: '/'
 				};
 			}
 			const configurationPhase = checkConfiguration(application);
diff --git a/apps/ui/src/routes/databases/[id]/__layout.svelte b/apps/ui/src/routes/databases/[id]/__layout.svelte
index 0acf6d291..9c8604d25 100644
--- a/apps/ui/src/routes/databases/[id]/__layout.svelte
+++ b/apps/ui/src/routes/databases/[id]/__layout.svelte
@@ -19,7 +19,7 @@
 			if (id !== 'new' && (!database || Object.entries(database).length === 0)) {
 				return {
 					status: 302,
-					redirect: '/databases'
+					redirect: '/'
 				};
 			}
 			const configurationPhase = checkConfiguration(database);
diff --git a/apps/ui/src/routes/destinations/[id]/__layout.svelte b/apps/ui/src/routes/destinations/[id]/__layout.svelte
index 306c17133..735265a5d 100644
--- a/apps/ui/src/routes/destinations/[id]/__layout.svelte
+++ b/apps/ui/src/routes/destinations/[id]/__layout.svelte
@@ -16,7 +16,7 @@
 			if (id !== 'new' && (!destination || Object.entries(destination).length === 0)) {
 				return {
 					status: 302,
-					redirect: '/destinations'
+					redirect: '/'
 				};
 			}
 			const configurationPhase = checkConfiguration(destination);
diff --git a/apps/ui/src/routes/services/[id]/__layout.svelte b/apps/ui/src/routes/services/[id]/__layout.svelte
index a12c3b0a8..bfaac583f 100644
--- a/apps/ui/src/routes/services/[id]/__layout.svelte
+++ b/apps/ui/src/routes/services/[id]/__layout.svelte
@@ -19,7 +19,7 @@
 			if (!service || Object.entries(service).length === 0) {
 				return {
 					status: 302,
-					redirect: '/databases'
+					redirect: '/'
 				};
 			}
 			const configurationPhase = checkConfiguration(service);
diff --git a/apps/ui/src/routes/sources/[id]/__layout.svelte b/apps/ui/src/routes/sources/[id]/__layout.svelte
index 0cd0c27b4..47cc8df1f 100644
--- a/apps/ui/src/routes/sources/[id]/__layout.svelte
+++ b/apps/ui/src/routes/sources/[id]/__layout.svelte
@@ -9,7 +9,7 @@
 			if (id !== 'new' && (!source || Object.entries(source).length === 0)) {
 				return {
 					status: 302,
-					redirect: '/sources'
+					redirect: '/'
 				};
 			}
 			return {