3 files changed, 10 insertions, 0 deletions

diff --git a/src/features/workspaces/api.js b/src/features/workspaces/api.js
index 4e076d233..634f9f989 100644
--- a/src/features/workspaces/api.js
+++ b/src/features/workspaces/api.js
@@ -58,3 +58,10 @@ export const getUserWorkspacesRequest = new CachedRequest(workspaceApi, 'getUser
 export const createWorkspaceRequest = new Request(workspaceApi, 'createWorkspace');
 export const deleteWorkspaceRequest = new Request(workspaceApi, 'deleteWorkspace');
 export const updateWorkspaceRequest = new Request(workspaceApi, 'updateWorkspace');
+
+export const resetApiRequests = () => {
+  getUserWorkspacesRequest.reset();
+  createWorkspaceRequest.reset();
+  deleteWorkspaceRequest.reset();
+  updateWorkspaceRequest.reset();
+};
diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.js
index 68f82bdee..0d30cd19d 100644
--- a/src/features/workspaces/index.js
+++ b/src/features/workspaces/index.js
@@ -1,5 +1,6 @@
 import { reaction } from 'mobx';
 import WorkspacesStore from './store';
+import { resetApiRequests } from './api';
 
 const debug = require('debug')('Franz:feature:workspaces');
 
@@ -22,6 +23,7 @@ export default function initWorkspaces(stores, actions) {
       } else if (workspaceStore.isFeatureActive) {
         debug('Disabling `workspaces` feature');
         workspaceStore.stop();
+        resetApiRequests();
       }
     },
     {
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 883f36ffb..dbb1d7b05 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -29,6 +29,7 @@ export default class WorkspacesStore {
   @observable isWorkspaceDrawerOpen = false;
 
   @computed get workspaces() {
+    if (!this.isFeatureActive) return [];
     return getUserWorkspacesRequest.execute().result || [];
   }