diff --git a/packages/standard-components/src/DataGrid/Component.svelte b/packages/standard-components/src/DataGrid/Component.svelte
index 6ec91558e5..a292104bd1 100644
--- a/packages/standard-components/src/DataGrid/Component.svelte
+++ b/packages/standard-components/src/DataGrid/Component.svelte
@@ -44,7 +44,7 @@
   }
 
   onMount(async () => {
-    if (datasource != null) {
+    if (!isEmpty(datasource)) {
       data = await fetchData(datasource, $store)
       let schema = {}
 
diff --git a/packages/standard-components/src/DataTable.svelte b/packages/standard-components/src/DataTable.svelte
index 80f2b306a2..eabd48c4c6 100644
--- a/packages/standard-components/src/DataTable.svelte
+++ b/packages/standard-components/src/DataTable.svelte
@@ -12,7 +12,7 @@
   export let color
   export let stripeColor
   export let borderColor
-  export let datasource = {}
+  export let datasource
   export let _bb
 
   let data = []