Merge branch 'release/5.4.0-beta.3' into fix/only-load-workspace-related-services

1 files changed, 2 insertions, 10 deletions

diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index b83fe335a..13227e033 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -146,16 +146,8 @@ export default class WorkspacesStore extends FeatureStore {
 
   filterServicesByActiveWorkspace = (services) => {
     const { activeWorkspace, isFeatureActive } = this;
-    if (isFeatureActive) {
-      if (activeWorkspace) {
-        return this.getWorkspaceServices(activeWorkspace);
-      }
-      // There is no active workspace yet but we might be still loading them
-      if (!getUserWorkspacesRequest.wasExecuted || getUserWorkspacesRequest.isExecutingFirstTime) {
-        // If so, do not show any services to avoid loading all of them unfiltered
-        // and then having the filter flashing in (which is ugly and slow).
-        return [];
-      }
+    if (isFeatureActive && activeWorkspace) {
+      return this.getWorkspaceServices(activeWorkspace);
     }
     return services;
   };