diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
index cfddac8019..b0464e28ee 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
@@ -12,9 +12,9 @@
 
   let selectedPanel = null
   let panelOptions = []
-  $: integration = datasource && $integrations[datasource.source]
 
-  $: datasource = $datasources.selected
+  // datasources.selected can return null temporarily on datasource deletion
+  $: datasource = $datasources.selected || {}
 
   $: getOptions(datasource)