diff --git a/desktop/plugins/public/databases/DatabasesPlugin.tsx b/desktop/plugins/public/databases/DatabasesPlugin.tsx
index b75b582c2..c642a4ddc 100644
--- a/desktop/plugins/public/databases/DatabasesPlugin.tsx
+++ b/desktop/plugins/public/databases/DatabasesPlugin.tsx
@@ -216,7 +216,7 @@ const DataTable = React.memo(
     currentStructure: Structure | null;
     onRowEdited: (changes: {[key: string]: string | null}) => void;
   }) =>
-    page ? (
+    page && page.columns ? (
       <Layout.Horizontal grow>
         <ManagedTable
           tableKey={`databases-${page.databaseId}-${page.table}`}