diff --git a/app/store/index.js b/app/store/index.js
index 30e0a1022..5a16a38c3 100644
--- a/app/store/index.js
+++ b/app/store/index.js
@@ -95,7 +95,7 @@ export default function configureAppStore(initialState) {
                         },
                         {
                             type: ViewTypes.SERVER_URL_CHANGED,
-                            serverUrl: state.views.selectServer.serverUrl
+                            serverUrl: state.entities.general.credentials.url || state.views.selectServer.serverUrl
                         }
                     ]));
 
@@ -120,5 +120,5 @@ export default function configureAppStore(initialState) {
         }
     };
 
-    return configureStore({}, appReducer, getAppReducer, offlineOptions);
+    return configureStore({}, appReducer, offlineOptions, getAppReducer);
 }