diff --git a/packages/api/src/controllers/connections.js b/packages/api/src/controllers/connections.js
index f46bc1e39..4c64177de 100644
--- a/packages/api/src/controllers/connections.js
+++ b/packages/api/src/controllers/connections.js
@@ -166,9 +166,11 @@ module.exports = {
 
   list_meta: true,
   async list() {
-    return portalConnections && !platformInfo.allowShellConnection
-      ? portalConnections.map(maskConnection)
-      : this.datastore.find();
+    if (portalConnections) {
+      if (platformInfo.allowShellConnection) return portalConnections;
+      return portalConnections.map(maskConnection);
+    }
+    return this.datastore.find();
   },
 
   test_meta: true,
diff --git a/packages/api/src/utility/requireEngineDriver.js b/packages/api/src/utility/requireEngineDriver.js
index 2b42ed1bc..f6b397ac3 100644
--- a/packages/api/src/utility/requireEngineDriver.js
+++ b/packages/api/src/utility/requireEngineDriver.js
@@ -16,7 +16,9 @@ function requireEngineDriver(connection) {
   if (engine.includes('@')) {
     const [shortName, packageName] = engine.split('@');
     const plugin = requirePlugin(packageName);
-    return plugin.drivers.find(x => x.engine == engine);
+    if (plugin.drivers) {
+      return plugin.drivers.find(x => x.engine == engine);
+    }
   }
   throw new Error(`Could not find engine driver ${engine}`);
 }