diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/LockScreenConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/LockScreenConfig.kt
index 7a274ddfbc..edeb0c0643 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/LockScreenConfig.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/LockScreenConfig.kt
@@ -73,7 +73,7 @@ object LockScreenConfigModule {
         pinBlacklist = setOf("0000", "1234"),
         pinSize = 4,
         maxPinCodeAttemptsBeforeLogout = 3,
-        gracePeriod = 90.seconds,
+        gracePeriod = 0.seconds,
         isStrongBiometricsEnabled = true,
         isWeakBiometricsEnabled = true,
     )
diff --git a/changelog.d/1732.misc b/changelog.d/1732.misc
new file mode 100644
index 0000000000..f5fa5be982
--- /dev/null
+++ b/changelog.d/1732.misc
@@ -0,0 +1 @@
+Set lock grace period to 0.