diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Activities/BaseActivity.java b/app/src/main/java/org/shadowice/flocke/andotp/Activities/BaseActivity.java
index f74fdfc6..1a3c7a71 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Activities/BaseActivity.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Activities/BaseActivity.java
@@ -67,7 +67,7 @@ public abstract class BaseActivity extends ThemedActivity {
     }
 
     protected boolean shouldDestroyOnScreenOff() {
-        return getClass() != MainActivity.class;
+        return true;
     }
 
     interface BroadcastReceivedCallback {
diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java b/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
index d8f8fc70..82e1ff7a 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
@@ -951,4 +951,9 @@ public class MainActivity extends BaseActivity
         emptyListView.setVisibility(itemCount > 0 ? View.GONE : View.VISIBLE);
 
     }
+
+    @Override
+    protected boolean shouldDestroyOnScreenOff() {
+        return false;
+    }
 }