diff --git a/packages/builder/src/components/design/settings/controls/TableSelect.svelte b/packages/builder/src/components/design/settings/controls/TableSelect.svelte
index 03b739e09f..ced1151969 100644
--- a/packages/builder/src/components/design/settings/controls/TableSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/TableSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { createEventDispatcher } from "svelte"
+  import { createEventDispatcher, onMount } from "svelte"
   import { tables as tablesStore } from "stores/backend"
 
   export let value
@@ -28,16 +28,6 @@
     []
   )
   $: options = [...(tables || []), ...(views || [])]
-  $: {
-    // Migrate old table values before "key" existed
-    if (value && !value.key) {
-      console.log("migrate")
-      dispatch(
-        "change",
-        tables.find(x => x.tableId === value.tableId)
-      )
-    }
-  }
 
   const onChange = e => {
     dispatch(
@@ -45,6 +35,15 @@
       options.find(x => x.key === e.detail)
     )
   }
+
+  onMount(() => {
+    // Migrate old values before "key" existed
+    if (value && !value.key) {
+      const view = views.find(x => x.key === value.id)
+      const table = tables.find(x => x.key === value._id)
+      dispatch("change", view || table)
+    }
+  })
 </script>
 
 <Select
diff --git a/packages/client/src/components/app/DataProvider.svelte b/packages/client/src/components/app/DataProvider.svelte
index 62a0588172..2639c77edd 100644
--- a/packages/client/src/components/app/DataProvider.svelte
+++ b/packages/client/src/components/app/DataProvider.svelte
@@ -29,6 +29,9 @@
     paginate,
   })
 
+  // Sanitize schema to remove hidden fields
+  $: schema = sanitizeSchema($fetch.schema)
+
   // Build our action context
   $: actions = [
     {
@@ -66,7 +69,7 @@
     rows: $fetch.rows,
     info: $fetch.info,
     datasource: dataSource || {},
-    schema: $fetch.schema,
+    schema,
     rowsLength: $fetch.rows.length,
 
     // Undocumented properties. These aren't supposed to be used in builder
@@ -94,6 +97,19 @@
     })
   }
 
+  const sanitizeSchema = schema => {
+    if (!schema) {
+      return schema
+    }
+    let cloned = { ...schema }
+    Object.entries(cloned).forEach(([field, fieldSchema]) => {
+      if (fieldSchema.visible === false) {
+        delete cloned[field]
+      }
+    })
+    return cloned
+  }
+
   const addQueryExtension = (key, extension) => {
     if (!key || !extension) {
       return