diff --git a/packages/frontend-core/src/components/FilterBuilder.svelte b/packages/frontend-core/src/components/FilterBuilder.svelte
index 5f58c9ea7f..c0bc328a4e 100644
--- a/packages/frontend-core/src/components/FilterBuilder.svelte
+++ b/packages/frontend-core/src/components/FilterBuilder.svelte
@@ -31,7 +31,7 @@
     if (
       tables.find(
         table =>
-          table._id === datasource.tableId &&
+          table._id === datasource?.tableId &&
           table.sourceId === DEFAULT_BB_DATASOURCE_ID
       ) &&
       !schemaFields.some(field => field.name === "_id")