1 files changed, 3 insertions, 7 deletions

diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.js
index b4cfd3c2d..50ac3b414 100644
--- a/src/features/workspaces/index.js
+++ b/src/features/workspaces/index.js
@@ -1,14 +1,11 @@
-import { observable, reaction } from 'mobx';
-import { merge } from 'lodash';
+import { reaction } from 'mobx';
 import WorkspacesStore from './store';
 import api from './api';
+import { state, resetState } from './state';
 
 const debug = require('debug')('Franz:feature:workspaces');
 
 let store = null;
-const defaultState = { workspaces: [] };
-
-export const state = observable(defaultState);
 
 export default function initWorkspaces(stores, actions) {
   const { features, user } = stores;
@@ -27,8 +24,7 @@ export default function initWorkspaces(stores, actions) {
         debug('Disabling `workspaces` feature');
         store.teardown();
         store = null;
-        // Reset state to default
-        merge(state, defaultState);
+        resetState(); // Reset state to default
       }
     },
     {