Improve cleanup code of invalid service references

1 files changed, 4 insertions, 1 deletions

diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 6118df79a..07b16ff23 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -312,9 +312,12 @@ export default class WorkspacesStore extends FeatureStore {
 
   _cleanupInvalidServiceReferences = () => {
     const { services } = this.stores;
+    const { allServicesRequest } = services;
+    const servicesHaveBeenLoaded = allServicesRequest.wasExecuted && !allServicesRequest.isError;
+    // Loop through all workspaces and remove invalid service ids (locally)
     this.workspaces.forEach((workspace) => {
       workspace.services.forEach((serviceId) => {
-        if (services.allServicesRequest.wasExecuted && !services.one(serviceId)) {
+        if (servicesHaveBeenLoaded && !services.one(serviceId)) {
           workspace.services.remove(serviceId);
         }
       });