diff --git a/packages/api/src/controllers/metadata.js b/packages/api/src/controllers/metadata.js
index 5be4cea06..093914a7f 100644
--- a/packages/api/src/controllers/metadata.js
+++ b/packages/api/src/controllers/metadata.js
@@ -22,7 +22,6 @@ module.exports = {
       (res, type) => ({
         ...res,
         [type]: pickObjectNames(opened.structure[type]),
-        status: opened.status,
       }),
       {}
     );
diff --git a/packages/web/src/datagrid/DataGridCore.js b/packages/web/src/datagrid/DataGridCore.js
index 189317edb..b41f1e0b6 100644
--- a/packages/web/src/datagrid/DataGridCore.js
+++ b/packages/web/src/datagrid/DataGridCore.js
@@ -446,7 +446,15 @@ export default function DataGridCore(props) {
     }
   }, [display && display.focusedColumn]);
 
-  if (!loadedRows || !columns) return null;
+  if (!loadedRows || !columns || columns.length == 0)
+    return (
+      <LoadingInfoWrapper>
+        <LoadingInfoBox>
+          <LoadingInfo message="Waiting for structure" />
+        </LoadingInfoBox>
+      </LoadingInfoWrapper>
+    );
+
   const insertedRows = getChangeSetInsertedRows(changeSet, display.baseTable);
   const rowCountNewIncluded = loadedRows.length + insertedRows.length;
 
diff --git a/packages/web/src/utility/metadataLoaders.js b/packages/web/src/utility/metadataLoaders.js
index 576519310..0f19e2364 100644
--- a/packages/web/src/utility/metadataLoaders.js
+++ b/packages/web/src/utility/metadataLoaders.js
@@ -24,7 +24,7 @@ const connectionInfoLoader = ({ conid }) => ({
 const sqlObjectListLoader = ({ conid, database }) => ({
   url: 'metadata/list-objects',
   params: { conid, database },
-  reloadTrigger: [`database-structure-changed-${conid}-${database}`, `database-status-changed-${conid}-${database}`],
+  reloadTrigger: `database-structure-changed-${conid}-${database}`,
 });
 
 const databaseStatusLoader = ({ conid, database }) => ({
diff --git a/packages/web/src/widgets/DatabaseWidget.js b/packages/web/src/widgets/DatabaseWidget.js
index 992fe53ce..74697a6be 100644
--- a/packages/web/src/widgets/DatabaseWidget.js
+++ b/packages/web/src/widgets/DatabaseWidget.js
@@ -7,7 +7,7 @@ import databaseAppObject from '../appobj/databaseAppObject';
 import { useSetCurrentDatabase, useCurrentDatabase, useOpenedConnections } from '../utility/globalState';
 import InlineButton from './InlineButton';
 import databaseObjectAppObject from '../appobj/databaseObjectAppObject';
-import { useSqlObjectList, useDatabaseList, useConnectionList, useServerStatus } from '../utility/metadataLoaders';
+import { useSqlObjectList, useDatabaseList, useConnectionList, useServerStatus, useDatabaseStatus } from '../utility/metadataLoaders';
 import { SearchBoxWrapper, InnerContainer, Input, MainContainer, OuterContainer, WidgetTitle } from './WidgetStyles';
 import axios from '../utility/axios';
 import LoadingInfo from './LoadingInfo';
@@ -69,7 +69,7 @@ function ConnectionList() {
 
 function SqlObjectList({ conid, database }) {
   const objects = useSqlObjectList({ conid, database });
-  const { status } = objects || {};
+  const status = useDatabaseStatus({ conid, database });
 
   const handleRefreshDatabase = () => {
     axios.post('database-connections/refresh', { conid, database });