diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index dfb6a3ef44..9f6468318a 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -5560,7 +5560,8 @@
       {
         "type": "dataSource",
         "label": "Data",
-        "key": "datasource"
+        "key": "table",
+        "required": true
       },
       {
         "type": "columns/grid",
diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte
index b3f7e826cd..8febaf44ff 100644
--- a/packages/client/src/components/app/GridBlock.svelte
+++ b/packages/client/src/components/app/GridBlock.svelte
@@ -4,7 +4,8 @@
   import { getContext } from "svelte"
   import { Grid } from "@budibase/frontend-core"
 
-  export let datasource
+  // table is actually any datasource, but called table for legacy compatibility
+  export let table
   export let allowAddRows = true
   export let allowEditRows = true
   export let allowDeleteRows = true
@@ -16,9 +17,6 @@
   export let columns = null
   export let onRowClick = null
 
-  // Legacy settings
-  export let table
-
   const component = getContext("component")
   const { styleable, API, builderStore, notificationStore } = getContext("sdk")
 
@@ -42,7 +40,7 @@
   class:in-builder={$builderStore.inBuilder}
 >
   <Grid
-    datasource={datasource || table}
+    datasource={table}
     {API}
     {stripeRows}
     {initialFilter}