diff --git a/.idea/misc.xml b/.idea/misc.xml
index 95f0f0310..1caa1363c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/build.gradle b/build.gradle
index 4f3de3f31..7948b7f95 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,7 +57,7 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 94
+        versionCode 95
         versionName "3.12"
         minSdkVersion 10
         targetSdkVersion 25
diff --git a/src/com/irccloud/android/NetworkConnection.java b/src/com/irccloud/android/NetworkConnection.java
index ed426dd53..1e3082fbf 100644
--- a/src/com/irccloud/android/NetworkConnection.java
+++ b/src/com/irccloud/android/NetworkConnection.java
@@ -1040,8 +1040,12 @@ public boolean hasResult(BaseTransaction<List<Model>> baseTransaction, List<Mode
         saveTimer.schedule(saveTimerTask, delay);*/
     }
 
+    public void connect() {
+        connect(false);
+    }
+
     @TargetApi(24)
-    public synchronized void connect() {
+    public synchronized void connect(boolean ignoreNetworkState) {
         Crashlytics.log(Log.DEBUG, TAG, "connect()");
         Context ctx = IRCCloudApplication.getInstance().getApplicationContext();
         session = ctx.getSharedPreferences("prefs", 0).getString("session_key", "");
@@ -1059,7 +1063,7 @@ public synchronized void connect() {
         if(cm != null) {
             NetworkInfo ni = cm.getActiveNetworkInfo();
 
-            if (ni != null && !ni.isConnectedOrConnecting()) {
+            if (!ignoreNetworkState && ni != null && !ni.isConnectedOrConnecting()) {
                 Crashlytics.log(Log.INFO, TAG, "No active network connection");
                 cancel_idle_timer();
                 state = STATE_DISCONNECTED;
diff --git a/src/com/irccloud/android/activity/BaseActivity.java b/src/com/irccloud/android/activity/BaseActivity.java
index 14fe9c163..3acf45211 100644
--- a/src/com/irccloud/android/activity/BaseActivity.java
+++ b/src/com/irccloud/android/activity/BaseActivity.java
@@ -269,7 +269,7 @@ protected void onPostResume() {
         if(conn != null){
             Crashlytics.log(Log.INFO, "IRCCloud", "App resumed, websocket state: " + conn.getState());
             if(conn.getState() == NetworkConnection.STATE_DISCONNECTED || conn.getState() == NetworkConnection.STATE_DISCONNECTING)
-                conn.connect();
+                conn.connect(true);
         }
     }