diff --git a/src/common/user-store/user-store.injectable.ts b/src/common/user-store/user-store.injectable.ts
index 14be4c45fd..9a34144828 100644
--- a/src/common/user-store/user-store.injectable.ts
+++ b/src/common/user-store/user-store.injectable.ts
@@ -7,7 +7,13 @@ import { UserStore } from "./user-store";
 
 const userStoreInjectable = getInjectable({
   id: "user-store",
-  instantiate: () => UserStore.createInstance(),
+
+  instantiate: () => {
+    UserStore.resetInstance();
+
+    return UserStore.createInstance();
+  },
+
   causesSideEffects: true,
 });
 
diff --git a/src/extensions/extensions-store/extensions-store.injectable.ts b/src/extensions/extensions-store/extensions-store.injectable.ts
index b31817e2e9..edf84e4b66 100644
--- a/src/extensions/extensions-store/extensions-store.injectable.ts
+++ b/src/extensions/extensions-store/extensions-store.injectable.ts
@@ -7,7 +7,13 @@ import { ExtensionsStore } from "./extensions-store";
 
 const extensionsStoreInjectable = getInjectable({
   id: "extensions-store",
-  instantiate: () => ExtensionsStore.createInstance(),
+
+  instantiate: () => {
+    ExtensionsStore.resetInstance();
+
+    return ExtensionsStore.createInstance();
+  },
+
   causesSideEffects: true,
 });
 
diff --git a/src/main/window-manager.injectable.ts b/src/main/window-manager.injectable.ts
index ce4f0a6f77..6a1f54a660 100644
--- a/src/main/window-manager.injectable.ts
+++ b/src/main/window-manager.injectable.ts
@@ -7,7 +7,13 @@ import { WindowManager } from "./window-manager";
 
 const windowManagerInjectable = getInjectable({
   id: "window-manager",
-  instantiate: () => WindowManager.createInstance(),
+
+  instantiate: () => {
+    WindowManager.resetInstance();
+
+    return WindowManager.createInstance();
+  },
+
   causesSideEffects: true,
 });
 
diff --git a/src/renderer/theme-store.injectable.ts b/src/renderer/theme-store.injectable.ts
index b656d47b23..40e8a6fc59 100644
--- a/src/renderer/theme-store.injectable.ts
+++ b/src/renderer/theme-store.injectable.ts
@@ -7,7 +7,13 @@ import { ThemeStore } from "./theme.store";
 
 const themeStoreInjectable = getInjectable({
   id: "theme-store",
-  instantiate: () => ThemeStore.createInstance(),
+
+  instantiate: () => {
+    ThemeStore.resetInstance();
+
+    return ThemeStore.createInstance();
+  },
+
   causesSideEffects: true,
 });