diff --git a/legacy/firmware/config.c b/legacy/firmware/config.c
index d1bc5745f..e48120a3a 100644
--- a/legacy/firmware/config.c
+++ b/legacy/firmware/config.c
@@ -962,6 +962,7 @@ uint32_t config_getAutoLockDelayMs() {
   if (sectrue != config_get_uint32(KEY_AUTO_LOCK_DELAY_MS, &autoLockDelayMs)) {
     autoLockDelayMs = autoLockDelayMsDefault;
   }
+  autoLockDelayMs = MAX(autoLockDelayMs, MIN_AUTOLOCK_DELAY_MS);
   autoLockDelayMsCached = sectrue;
   return autoLockDelayMs;
 }
diff --git a/legacy/firmware/config.h b/legacy/firmware/config.h
index b7146fe51..4777cb34a 100644
--- a/legacy/firmware/config.h
+++ b/legacy/firmware/config.h
@@ -85,8 +85,13 @@ extern Storage configUpdate;
 #define MAX_MNEMONIC_LEN 240
 #define HOMESCREEN_SIZE 1024
 #define UUID_SIZE 12
+
+#if DEBUG_LINK
 #define MIN_AUTOLOCK_DELAY_MS (10 * 1000U)  // 10 seconds
-#define MAX_AUTOLOCK_DELAY_MS 0x20000000U   // ~6 days
+#else
+#define MIN_AUTOLOCK_DELAY_MS (60 * 1000U)  // 1 minute
+#endif
+#define MAX_AUTOLOCK_DELAY_MS 0x20000000U  // ~6 days
 
 void config_init(void);
 void session_clear(bool lock);