diff --git a/src/services/state/dataStore.store.ts b/src/services/state/dataStore.store.ts
index 44be3e2f209874ab5b5ebdfc2a11f0fd0f72372a..941d10916773a7e5f6961ecb9e1894868bd38467 100644
--- a/src/services/state/dataStore.store.ts
+++ b/src/services/state/dataStore.store.ts
@@ -49,8 +49,10 @@ export const getStateStore = ({ state: state = defaultState } = {}) => (prevStat
 //
 // angular function expressions are not supported in decorators
 
-export function stateStore() {
-  return getStateStore()
+const defaultStateStore = getStateStore()
+
+export function stateStore(state, action){
+  return defaultStateStore(state, action)
 }
 
 export interface ActionInterface extends Action{
diff --git a/src/services/state/ngViewerState.store.ts b/src/services/state/ngViewerState.store.ts
index 2aefbdd5f16a075049f1430a79dcb4bd07a0a6d0..c0b07d0161acbbe9dff64a5679e5c02cd4417862 100644
--- a/src/services/state/ngViewerState.store.ts
+++ b/src/services/state/ngViewerState.store.ts
@@ -148,8 +148,10 @@ export const getStateStore = ({ state = defaultState } = {}) => (prevState:State
 //
 // angular function expressions are not supported in decorators
 
-export function stateStore(){
-  return getStateStore()
+const defaultStateStore = getStateStore()
+
+export function stateStore(state, action){
+  return defaultStateStore(state, action)
 }
 
 @Injectable({
diff --git a/src/services/state/pluginState.store.ts b/src/services/state/pluginState.store.ts
index 70de862ce22e9a635bcec517f6cb3a11699bb030..e4319567792737d4474c36301c1a993678481384 100644
--- a/src/services/state/pluginState.store.ts
+++ b/src/services/state/pluginState.store.ts
@@ -54,6 +54,8 @@ export const getStateStore = ({ state = defaultState } = {}) => (prevState:State
 //
 // angular function expressions are not supported in decorators
 
-export function stateStore() {
-  return getStateStore()
+const defaultStateStore = getStateStore()
+
+export function stateStore(state, action){
+  return defaultStateStore(state, action)
 }
diff --git a/src/services/state/uiState.store.ts b/src/services/state/uiState.store.ts
index cfb0dd3e775b929c5e88feb586326fc954cfeca9..865f49b38a63ea81d8946c920da355c104e4cf44 100644
--- a/src/services/state/uiState.store.ts
+++ b/src/services/state/uiState.store.ts
@@ -114,8 +114,10 @@ export const getStateStore = ({ state = defaultState } = {}) => (prevState:State
 //
 // angular function expressions are not supported in decorators
 
-export function stateStore() {
-  return getStateStore()
+const defaultStateStore = getStateStore()
+
+export function stateStore(state, action){
+  return defaultStateStore(state, action)
 }
 
 export interface StateInterface{
diff --git a/src/services/state/userConfigState.store.ts b/src/services/state/userConfigState.store.ts
index 9efc4417eb551604904cb679eda87fa844893538..95d414f4984a908e8fc9be6a3558e7ff1027fde1 100644
--- a/src/services/state/userConfigState.store.ts
+++ b/src/services/state/userConfigState.store.ts
@@ -78,8 +78,10 @@ export const getStateStore = ({ state = defaultState } = {}) => (prevState: Stat
 //
 // angular function expressions are not supported in decorators
 
-export function stateStore() {
-  return getStateStore()
+const defaultStateStore = getStateStore()
+
+export function stateStore(state, action){
+  return defaultStateStore(state, action)
 }
 
 @Injectable({
diff --git a/src/services/state/viewerState.store.ts b/src/services/state/viewerState.store.ts
index 35185f591ea081cba5d426dcb275e4e6b32b57fe..c30a83fac4e55d9627f53b7b5f9415fd65254d07 100644
--- a/src/services/state/viewerState.store.ts
+++ b/src/services/state/viewerState.store.ts
@@ -188,8 +188,10 @@ export const getStateStore = ({ state = defaultState } = {}) => (prevState:Parti
 //
 // angular function expressions are not supported in decorators
 
-export function stateStore() {
-  return getStateStore()
+const defaultStateStore = getStateStore()
+
+export function stateStore(state, action){
+  return defaultStateStore(state, action)
 }
 
 export const LOAD_DEDICATED_LAYER = 'LOAD_DEDICATED_LAYER'
diff --git a/src/ui/databrowserModule/kgSingleDatasetService.service.ts b/src/ui/databrowserModule/kgSingleDatasetService.service.ts
index a636fc77ac88102fa2d2823c38835d4c8cf55fa4..3efd76eabee157f862ab4fbd8e83b661d1262fce 100644
--- a/src/ui/databrowserModule/kgSingleDatasetService.service.ts
+++ b/src/ui/databrowserModule/kgSingleDatasetService.service.ts
@@ -10,6 +10,7 @@ import { ADD_NG_LAYER, REMOVE_NG_LAYER, CHANGE_NAVIGATION, IavRootStoreInterface
 import { Subscription, Subject } from "rxjs";
 import { HttpClient } from "@angular/common/http";
 import { GetKgSchemaIdFromFullIdPipe } from "./util/getKgSchemaIdFromFullId.pipe";
+import { filter } from "rxjs/operators";
 
 @Injectable({ providedIn: 'root' })
 export class KgSingleDatasetService implements OnDestroy{
@@ -31,7 +32,8 @@ export class KgSingleDatasetService implements OnDestroy{
 
     this.subscriptions.push(
       this.store$.pipe(
-        select('ngViewerState')
+        select('ngViewerState'),
+        filter(v => !!v)
       ).subscribe(layersInterface => {
         this.ngLayers = new Set(layersInterface.layers.map(l => l.source.replace(/^nifti\:\/\//, '')))
       })