diff --git a/src/ic/ics.js b/src/ic/ics.js
index bfdb45f..d305e2b 100644
--- a/src/ic/ics.js
+++ b/src/ic/ics.js
@@ -64,7 +64,11 @@ class InfrastructureComponents extends Component {
     }
   }
 
-  static calculateState() {
+  static calculateState(prevState, props) {
+    if (prevState == null) {
+      prevState = {};
+    }
+
     const ics = InfrastructureComponentStore.getState().sort((a, b) => {
       if (a.state !== b.state) {
           return InfrastructureComponents.statePrio(a.state) > InfrastructureComponents.statePrio(b.state);
@@ -100,7 +104,7 @@ class InfrastructureComponents extends Component {
       modalIC: {},
       deleteModal: false,
       icModal: false,
-      selectedICs: [],
+      selectedICs: prevState.selectedICs || [],
       currentUser: JSON.parse(localStorage.getItem("currentUser"))
     };
   }
diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index cd451e8..094b17f 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -110,7 +110,7 @@ class Scenario extends React.Component {
       deleteConfigModal: false,
       importConfigModal: false,
       newConfig: prevState.newConfig || false,
-      selectedConfigs: [],
+      selectedConfigs: prevState.selectedConfigs || [],
       filesEditModal: prevState.filesEditModal || false,
       filesEditSaveState: prevState.filesEditSaveState || [],
 
diff --git a/src/scenario/scenarios.js b/src/scenario/scenarios.js
index aef0740..a3c65a4 100644
--- a/src/scenario/scenarios.js
+++ b/src/scenario/scenarios.js
@@ -43,7 +43,10 @@ class Scenarios extends Component {
     return [ScenarioStore, DashboardStore, WidgetStore, ConfigStore, SignalStore];
   }
 
-  static calculateState() {
+  static calculateState(prevState, props) {
+    if (prevState == null) {
+      prevState = {};
+    }
 
     return {
       scenarios: ScenarioStore.getState(),
@@ -58,7 +61,7 @@ class Scenarios extends Component {
       importModal: false,
       modalScenario: {},
 
-      selectedScenarios: []
+      selectedScenarios: prevState.selectedScenarios || []
     };
   }