diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
index 14b1477b82..d45ccde7e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
@@ -355,7 +355,8 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
     return if (!enabledScreenLock) {
       getString(R.string.ScreenLockSettingsFragment__off)
     } else if (timeoutSeconds == 0L) {
-      getString(R.string.ScreenLockSettingsFragment__immediately)
+      Log.i(TAG, "Default immediate screen lock to one minute")
+      ExpirationUtil.getExpirationDisplayValue(requireContext(), 60)
     } else {
       ExpirationUtil.getExpirationDisplayValue(requireContext(), timeoutSeconds.toInt())
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
index 54938c5f87..8ae4fde452 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
@@ -239,6 +239,12 @@ public class KeyCachingService extends Service {
     boolean screenLockActive    = SignalStore.settings().getScreenLockEnabled();
     boolean immediateScreenLock = screenTimeout == 0 && screenLockActive;
 
+    if (immediateScreenLock) {
+      Log.i(TAG, "Default immediate screen lock to one minute");
+      SignalStore.settings().setScreenLockTimeout(60);
+      immediateScreenLock = false;
+    }
+
     if (!appVisible && secretSet && (passLockActive || screenLockActive)) {
       if (immediateScreenLock) {
         Log.i(TAG, "Starting immediate screen lock");
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 0e2559eb1a..de04366ca3 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -363,14 +363,12 @@
     </string-array>
 
     <string-array name="ScreenLockSettingsFragment__labels">
-        <item>@string/ScreenLockSettingsFragment__immediately</item>
         <item>@string/ScreenLockSettingsFragment__after_1_min</item>
         <item>@string/ScreenLockSettingsFragment__after_5_min</item>
         <item>@string/ScreenLockSettingsFragment__after_30_min</item>
     </string-array>
 
     <integer-array name="ScreenLockSettingsFragment__values">
-        <item>0</item>
         <item>60</item>
         <item>300</item>
         <item>1800</item>