diff --git a/packages/builder/src/pages/[application]/data/datasource/index.svelte b/packages/builder/src/pages/[application]/data/datasource/index.svelte
index 73b369ad6..b1c770846 100644
--- a/packages/builder/src/pages/[application]/data/datasource/index.svelte
+++ b/packages/builder/src/pages/[application]/data/datasource/index.svelte
@@ -1,18 +1,11 @@
 <script>
     import { backendUiStore } from "builderStore"
-    import { goto, leftover } from "@sveltech/routify"
+    import { goto } from "@sveltech/routify"
     import { onMount } from "svelte"
 
     onMount(async () => {
       // navigate to first table in list, if not already selected
-      // and this is the final url (i.e. no selectedTable)
-      if (
-        !$leftover &&
-        $backendUiStore.datasources.length > 0 && !$backendUiStore.selectedDatasourceId
-      ) {
-        // this file routes as .../tables/index, so, go up one.
-        $goto(`../${$backendUiStore.datasources[0]._id}`)
-      }
+      $backendUiStore.datasources.length > 0 && $goto(`../${$backendUiStore.datasources[0]._id}`)
     })
   </script>
   
diff --git a/packages/builder/src/pages/[application]/data/table/index.svelte b/packages/builder/src/pages/[application]/data/table/index.svelte
index 8491fca86..d1659257d 100644
--- a/packages/builder/src/pages/[application]/data/table/index.svelte
+++ b/packages/builder/src/pages/[application]/data/table/index.svelte
@@ -1,19 +1,10 @@
 <script>
   import { backendUiStore } from "builderStore"
-  import { goto, leftover } from "@sveltech/routify"
+  import { goto } from "@sveltech/routify"
   import { onMount } from "svelte"
 
   onMount(async () => {
-    // navigate to first table in list, if not already selected
-    // and this is the final url (i.e. no selectedTable)
-    if (
-      !$leftover &&
-      $backendUiStore.tables.length > 0 &&
-      (!$backendUiStore.selectedTable || !$backendUiStore.selectedTable._id)
-    ) {
-      // this file routes as .../tables/index, so, go up one.
-      $goto(`../${$backendUiStore.tables[0]._id}`)
-    }
+    $backendUiStore.tables.length > 0 && $goto(`../${$backendUiStore.tables[0]._id}`)
   })
 </script>