diff --git a/android/app/build.gradle b/android/app/build.gradle
index 45fcb1d8a..7445ac38f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -113,8 +113,8 @@ android {
         applicationId "com.mattermost.rnbeta"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 112
-        versionName "1.9.0"
+        versionCode 113
+        versionName "1.9.1"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
diff --git a/app/app.js b/app/app.js
index a3e0d78e0..bd8de9c31 100644
--- a/app/app.js
+++ b/app/app.js
@@ -76,6 +76,7 @@ export default class App {
                     return Initialization.credentials;
                 },
                 () => {
+                    this.waitForRehydration = true;
                     return getGenericPassword();
                 }
             );
@@ -153,6 +154,13 @@ export default class App {
         }
         const username = `${deviceToken}, ${currentUserId}`;
         const password = `${token},${url}`;
+
+        if (this.waitForRehydration) {
+            this.waitForRehydration = false;
+            this.token = token;
+            this.url = url;
+        }
+
         setGenericPassword(username, password);
     };
 
@@ -215,7 +223,7 @@ export default class App {
     };
 
     startApp = () => {
-        if (this.appStarted) {
+        if (this.appStarted || this.waitForRehydration) {
             return;
         }
 
diff --git a/app/fetch_preconfig.js b/app/fetch_preconfig.js
index 3cac7a6d6..9a8e02451 100644
--- a/app/fetch_preconfig.js
+++ b/app/fetch_preconfig.js
@@ -22,11 +22,15 @@ Client4.doFetchWithResponse = async (url, options) => {
             url,
         };
     }
-    const response = await fetch(url, Client4.getOptions(options));
-    const headers = response.headers;
+
+    let response;
+    let headers;
 
     let data;
     try {
+        response = await fetch(url, Client4.getOptions(options));
+        headers = response.headers;
+
         data = await response.json();
     } catch (err) {
         if (response && response.resp && response.resp.data && response.resp.data.includes('SSL certificate')) {
diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj
index 56768b5f5..fac33d8ea 100644
--- a/ios/Mattermost.xcodeproj/project.pbxproj
+++ b/ios/Mattermost.xcodeproj/project.pbxproj
@@ -2533,7 +2533,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 112;
+				CURRENT_PROJECT_VERSION = 113;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
@@ -2583,7 +2583,7 @@
 				CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 112;
+				CURRENT_PROJECT_VERSION = 113;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = UQ8HT4Q2XM;
 				ENABLE_BITCODE = NO;
diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist
index da58d1c48..aeb93ad6e 100644
--- a/ios/Mattermost/Info.plist
+++ b/ios/Mattermost/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.0</string>
+	<string>1.9.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>112</string>
+	<string>113</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist
index 90f8a47f7..de4b23ddf 100644
--- a/ios/MattermostShare/Info.plist
+++ b/ios/MattermostShare/Info.plist
@@ -21,9 +21,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.0</string>
+	<string>1.9.1</string>
 	<key>CFBundleVersion</key>
-	<string>112</string>
+	<string>113</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist
index 2168c7f28..c2dc1dc8a 100644
--- a/ios/MattermostTests/Info.plist
+++ b/ios/MattermostTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.0</string>
+	<string>1.9.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>112</string>
+	<string>113</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 7570003fd..bc777de91 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9878,8 +9878,8 @@
       }
     },
     "mattermost-redux": {
-      "version": "github:mattermost/mattermost-redux#6aee7c45bcde7d2079ee5b24f70e7e8d071ae0a6",
-      "from": "github:mattermost/mattermost-redux#6aee7c45bcde7d2079ee5b24f70e7e8d071ae0a6",
+      "version": "github:mattermost/mattermost-redux#d2e9ba4f30a7bdfccda9aab1cfa8124c4ca1f275",
+      "from": "github:mattermost/mattermost-redux#d2e9ba4f30a7bdfccda9aab1cfa8124c4ca1f275",
       "requires": {
         "deep-equal": "1.0.1",
         "eslint-plugin-header": "1.2.0",
diff --git a/package.json b/package.json
index 6cee7ced5..068ee2bce 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "intl": "1.2.5",
     "jail-monkey": "1.0.0",
     "jsc-android": "216113.0.3",
-    "mattermost-redux": "github:mattermost/mattermost-redux#6aee7c45bcde7d2079ee5b24f70e7e8d071ae0a6",
+    "mattermost-redux": "github:mattermost/mattermost-redux#d2e9ba4f30a7bdfccda9aab1cfa8124c4ca1f275",
     "mime-db": "1.33.0",
     "prop-types": "15.6.1",
     "react": "16.3.2",