diff --git a/packages/builder/src/builderStore/store/backend/tables.js b/packages/builder/src/builderStore/store/backend/tables.js
index 29c09839dc..18a29ded32 100644
--- a/packages/builder/src/builderStore/store/backend/tables.js
+++ b/packages/builder/src/builderStore/store/backend/tables.js
@@ -19,13 +19,21 @@ function createTablesStore() {
         const tables = await tablesResponse.json()
         update(state => ({...state, list: tables}))
     },
-    select: table =>
-        update(state => ({
-            ...state,
-            selected: table,
-            draft: cloneDeep(table),
-            view: { name: `all_${table._id}` }
-        })),
+    select: table => {
+        if (!table) {
+            update(state => ({
+                ...state,
+                selected: {}
+            }))
+        } else {
+            update(state => ({
+                ...state,
+                selected: table,
+                draft: cloneDeep(table),
+                view: { name: `all_${table._id}` }
+            }))
+        }
+    },
     save: async table => {
         const updatedTable = cloneDeep(table)
         const oldTable = get(store).list.filter(t => t._id === table._id)[0]