diff --git a/app/src/debug/java/org/tasks/BuildSetup.java b/app/src/debug/java/org/tasks/BuildSetup.java
index 77800ee4d..d8a714548 100644
--- a/app/src/debug/java/org/tasks/BuildSetup.java
+++ b/app/src/debug/java/org/tasks/BuildSetup.java
@@ -33,7 +33,7 @@ public class BuildSetup {
     if (preferences.getBoolean(R.string.p_leak_canary, false)) {
       LeakCanary.install(application);
     }
-    if (preferences.getBoolean(R.string.p_strict_mode, false)) {
+    if (preferences.getBoolean(R.string.p_strict_mode_thread, false)) {
       StrictMode.setThreadPolicy(
           new StrictMode.ThreadPolicy.Builder()
               .detectDiskReads()
@@ -41,6 +41,8 @@ public class BuildSetup {
               .detectNetwork()
               .penaltyLog()
               .build());
+    }
+    if (preferences.getBoolean(R.string.p_strict_mode_vm, false)) {
       StrictMode.setVmPolicy(
           new StrictMode.VmPolicy.Builder()
               .detectLeakedSqlLiteObjects()
diff --git a/app/src/debug/res/xml/preferences_debug.xml b/app/src/debug/res/xml/preferences_debug.xml
index dd67e94e9..c696b1062 100644
--- a/app/src/debug/res/xml/preferences_debug.xml
+++ b/app/src/debug/res/xml/preferences_debug.xml
@@ -6,8 +6,12 @@
     android:title="@string/debug_leak_canary" />
 
   <CheckBoxPreference
-    android:key="@string/p_strict_mode"
-    android:title="@string/debug_strict_mode"/>
+    android:key="@string/p_strict_mode_thread"
+    android:title="@string/debug_strict_mode_thread"/>
+
+  <CheckBoxPreference
+    android:key="@string/p_strict_mode_vm"
+    android:title="@string/debug_strict_mode_vm"/>
 
   <CheckBoxPreference
     android:key="@string/p_debug_pro"
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 1f55b7dc0..918e55439 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -280,7 +280,8 @@
   <string name="p_default_remote_list">default_remote_list</string>
 
   <string name="debug_consume">Consume</string>
-  <string name="debug_strict_mode">Strict mode</string>
+  <string name="debug_strict_mode_thread">Strict mode - Thread</string>
+  <string name="debug_strict_mode_vm">Strict mode - VM</string>
   <string name="debug_leak_canary">LeakCanary</string>
   <string name="debug_pro">Unlock pro</string>
   <string name="debug_buy">Buy</string>
@@ -289,7 +290,8 @@
   <string name="p_use_native_datetime_pickers">use_native_datetime_pickers</string>
   <string name="p_background_sync">gtask_background_sync</string>
   <string name="p_bundle_notifications">bundle_notifications</string>
-  <string name="p_strict_mode">strict_mode</string>
+  <string name="p_strict_mode_vm">strict_mode_vm</string>
+  <string name="p_strict_mode_thread">strict_mode_thread</string>
   <string name="p_leak_canary">leak_canary</string>
   <string name="p_debug_pro">debug_pro</string>
   <string name="warned_play_services">warned_play_services</string>