From 8b3bbc78b8f3c30df902932caa4f0f717e1479e3 Mon Sep 17 00:00:00 2001
From: Iku-turso <mikko.aspiala@gmail.com>
Date: Wed, 13 Apr 2022 13:17:40 +0300
Subject: [PATCH] Make lifecycle of injectable store work as expected

Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>
---
 src/common/cluster-store/cluster-store.injectable.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/common/cluster-store/cluster-store.injectable.ts b/src/common/cluster-store/cluster-store.injectable.ts
index a47978376a..58b540495a 100644
--- a/src/common/cluster-store/cluster-store.injectable.ts
+++ b/src/common/cluster-store/cluster-store.injectable.ts
@@ -9,10 +9,13 @@ import { createClusterInjectionToken } from "../cluster/create-cluster-injection
 const clusterStoreInjectable = getInjectable({
   id: "cluster-store",
 
-  instantiate: (di) =>
-    ClusterStore.createInstance({
+  instantiate: (di) => {
+    ClusterStore.resetInstance();
+
+    return ClusterStore.createInstance({
       createCluster: di.inject(createClusterInjectionToken),
-    }),
+    });
+  },
 
   causesSideEffects: true,
 });