diff --git a/src/App.js b/src/App.js
index 832672a..a853042 100644
--- a/src/App.js
+++ b/src/App.js
@@ -110,7 +110,7 @@ class App extends IPCContainer {
     const remoteSupported = this.props.LocationsLookup[selectedVersion] &&
       this.props.LocationsLookup[selectedVersion].supports_remote;
 
-    let s3Supported = this.props.LocationsLookup[selectedVersion] &&
+    const s3Supported = this.props.LocationsLookup[selectedVersion] &&
       this.props.LocationsLookup[selectedVersion].s3_support;
 
     const skynetSupported = this.props.LocationsLookup[selectedVersion] &&
diff --git a/src/index.js b/src/index.js
index 00417b5..008c70c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -26,14 +26,13 @@ if (ipcRenderer) {
     ipcRenderer.once(Constants.IPC_Get_State_Reply, (event, result) => {
       if (result.data) {
         store = createAppStore(platformInfo, packageJson.version, result.data);
-        store.dispatch(setActiveRelease(result.data.Release, result.data.Version));
         const providerList = [
           ...Constants.PROVIDER_LIST,
           ...store.getState().mounts.RemoteMounts,
           ...store.getState().mounts.S3Mounts,
         ];
         for (const provider of providerList) {
-          let state = result.data[provider] || store.getState().mounts.ProviderState[provider];
+          const state = result.data[provider];
           if (state.AutoMount === undefined) {
             state['AutoMount'] = false;
           }
@@ -42,6 +41,7 @@ if (ipcRenderer) {
           }
           store.dispatch(setProviderState(provider, state));
         }
+        store.dispatch(setActiveRelease(result.data.Release, result.data.Version));
       } else {
         store = createAppStore(platformInfo, packageJson.version, {});
       }