diff --git a/packages/builder/src/pages/[application]/data/table/[selectedTable]/index.svelte b/packages/builder/src/pages/[application]/data/table/[selectedTable]/index.svelte
index 90413341d0..f19778dc30 100644
--- a/packages/builder/src/pages/[application]/data/table/[selectedTable]/index.svelte
+++ b/packages/builder/src/pages/[application]/data/table/[selectedTable]/index.svelte
@@ -2,10 +2,10 @@
import TableDataTable from "components/backend/DataTable/DataTable.svelte"
import { tables, database } from 'builderStore/store/backend/'
- $: selectedTable = $tables.selected
+ $: console.log('Tables: ', $tables)
-{#if $database._id && selectedTable.name}
+{#if $database?._id && $tables?.selected?.name}
{:else}Create your first table to start building{/if}