diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index e984d1d78..a1922a72a 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -109,7 +109,7 @@
     };
 
     let showAccountMenu = false;
-    let subNavigation: undefined | ComponentType = $page.data.subNavigation;
+    $: subNavigation = $page.data.subNavigation;
     let state: undefined | 'open' | 'closed' | 'icons' = 'closed';
     $: state = $isSidebarOpen ? 'open' : 'closed';
 
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
index 172aa29ae..cd0a6dd3e 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/subNavigation.svelte
@@ -18,10 +18,11 @@
         a.$updatedAt > b.$updatedAt ? -1 : 1
     );
 
-    $: selectedCollection = sortedCollections.find((collection) => collection.$id === collectionId);
+    $: selectedCollection = sortedCollections?.find(
+        (collection) => collection.$id === collectionId
+    );
 
     let openBottomSheet = false;
-    console.log('isTabletViewport', $isTabletViewport);
 </script>
 
 {#if !$isTabletViewport}