1 files changed, 7 insertions, 4 deletions

diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.js
index 26cadea64..1644c0e2f 100644
--- a/src/features/workspaces/index.js
+++ b/src/features/workspaces/index.js
@@ -8,10 +8,13 @@ const debug = require('debug')('Franz:feature:workspaces');
 let store = null;
 
 export const filterServicesByActiveWorkspace = (services) => {
-  const { isFeatureActive, activeWorkspace } = workspacesState;
-  if (isFeatureActive && activeWorkspace) {
-    return services.filter(s => activeWorkspace.services.includes(s.id));
-  }
+  const {
+    activeWorkspace,
+    isFeatureActive,
+  } = workspacesState;
+
+  if (!isFeatureActive) return services;
+  if (activeWorkspace) return services.filter(s => activeWorkspace.services.includes(s.id));
   return services;
 };