PR comments.

packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte

@@ -23,5 +23,7 @@
 </script>
 
 {#key $params.datasourceId}
+  {#if $datasources.selected}
     <slot />
+  {/if}
 {/key}

packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte

@@ -12,18 +12,11 @@
   import PromptQueryModal from "./_components/PromptQueryModal.svelte"
   import SettingsPanel from "./_components/panels/Settings.svelte"
   import { helpers } from "@budibase/shared-core"
-  import { goto } from "@roxi/routify"
 
   let selectedPanel = null
   let panelOptions = []
 
-  // datasources.selected can return null temporarily on datasource deletion
   $: datasource = $datasources.selected
-  $: {
-    if (!datasource) {
-      $goto("./datasource")
-    }
-  }
 
   $: getOptions(datasource)
 
@@ -58,7 +51,6 @@
 
 <PromptQueryModal />
 
-{#if datasource}
 <section>
   <Layout noPadding>
     <Layout gap="XS" noPadding>
@@ -104,7 +96,6 @@
     {/if}
   </Layout>
 </section>
-{/if}
 
 <style>
   section {