diff --git a/packages/api/src/controllers/databaseConnections.js b/packages/api/src/controllers/databaseConnections.js
index ad6560f2a..383531e02 100644
--- a/packages/api/src/controllers/databaseConnections.js
+++ b/packages/api/src/controllers/databaseConnections.js
@@ -619,7 +619,7 @@ module.exports = {
       message: `Loaded database structure for ${database}`,
     });
 
-    if (!hasPermission(`all-tables`, loadedPermissions)) {
+    if (process.env.STORAGE_DATABASE && !hasPermission(`all-tables`, loadedPermissions)) {
       // filter databases by permissions
       const tablePermissions = await loadTablePermissionsFromRequest(req);
       const databasePermissions = await loadDatabasePermissionsFromRequest(req);
diff --git a/packages/api/src/controllers/serverConnections.js b/packages/api/src/controllers/serverConnections.js
index c9f0f3fa1..e182f2184 100644
--- a/packages/api/src/controllers/serverConnections.js
+++ b/packages/api/src/controllers/serverConnections.js
@@ -46,7 +46,7 @@ module.exports = {
     existing.status = status;
     socket.emitChanged(`server-status-changed`);
   },
-  handle_ping() { },
+  handle_ping() {},
   handle_response(conid, { msgid, ...response }) {
     const [resolve, reject] = this.requests[msgid];
     resolve(response);
@@ -166,7 +166,7 @@ module.exports = {
       message: `Loaded databases for connection`,
     });
 
-    if (!hasPermission(`all-databases`, loadedPermissions)) {
+    if (process.env.STORAGE_DATABASE && !hasPermission(`all-databases`, loadedPermissions)) {
       // filter databases by permissions
       const databasePermissions = await loadDatabasePermissionsFromRequest(req);
       const res = [];