diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/header.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/header.svelte
index 1f954183a..f8edd878e 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/header.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/header.svelte
@@ -37,13 +37,12 @@
 
     const basePath = $derived.by(() => {
         const entityType = terminology.entity.lower.singular;
-        const entityId = page.params[entityType];
         return withPath(
             resolveRoute(
                 `/(console)/project-[region]-[project]/databases/database-[database]`,
                 page.params
             ),
-            `${entityType}-${entityId}`
+            `${entityType}-${entity.$id}`
         );
     });
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/view.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/view.svelte
index 573f7e05d..8f68ba2c6 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/view.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/view.svelte
@@ -294,7 +294,7 @@
             {@render emptyIndexesSheetView(() => (showCreateIndex = true))}
         {/if}
     {:else}
-        {@render emptyEntitiesSheetView()}
+        {@render emptyEntitiesSheetView?.()}
     {/if}
 
     {#if selectedIndexes.length > 0}