2 files changed, 13 insertions, 1 deletions

diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index bd0395376..5b28fb7c8 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -4,6 +4,7 @@ import DelayAppComponent from './Component';
 
 import { DEFAULT_FEATURES_CONFIG } from '../../config';
 import { gaEvent, gaPage } from '../../lib/analytics';
+import { getUserWorkspacesRequest } from '../workspaces/api';
 
 const debug = require('debug')('Franz:feature:delayApp');
 
@@ -33,7 +34,13 @@ export default function init(stores) {
   };
 
   reaction(
-    () => stores.user.isLoggedIn && stores.services.allServicesRequest.wasExecuted && stores.features.features.needToWaitToProceed && !stores.user.data.isPremium,
+    () => (
+      stores.user.isLoggedIn
+      && stores.services.allServicesRequest.wasExecuted
+      && getUserWorkspacesRequest.wasExecuted
+      && stores.features.features.needToWaitToProceed
+      && !stores.user.data.isPremium
+    ),
     (isEnabled) => {
       if (isEnabled) {
         debug('Enabling `delayApp` feature');
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 7f41cfc88..13227e033 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -45,6 +45,11 @@ export default class WorkspacesStore extends FeatureStore {
     return getUserWorkspacesRequest.result || [];
   }
 
+  @computed get isLoadingWorkspaces() {
+    if (!this.isFeatureActive) return false;
+    return getUserWorkspacesRequest.isExecutingFirstTime;
+  }
+
   @computed get settings() {
     return localStorage.getItem('workspaces') || {};
   }