diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 6865da3470..6c20a12b0b 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -218,7 +218,9 @@
 
         <activity android:name=".features.terms.ReviewTermsActivity" />
         <activity android:name=".features.widgets.WidgetActivity" />
-        <activity android:name=".features.pin.PinActivity" />
+        <activity
+            android:name=".features.pin.PinActivity"
+            android:launchMode="singleTop" />
 
         <!-- Services -->
 
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt b/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt
index fbdd6d5b78..c35e481b18 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinLocker.kt
@@ -32,9 +32,6 @@ import javax.inject.Singleton
 // 2 minutes, when enabled
 private const val PERIOD_OF_GRACE_IN_MS = 2 * 60 * 1000L
 
-// 1 seconds, to avoid asking for PIN code when switching between Activities
-private const val PERIOD_OF_GRACE_DISABLED_IN_MS = 1000L
-
 /**
  * This class is responsible for keeping the status of locking
  * It automatically locks when entering background/foreground with a grace period.
@@ -112,7 +109,7 @@ class PinLocker @Inject constructor(
         return if (vectorPreferences.useGracePeriod()) {
             PERIOD_OF_GRACE_IN_MS
         } else {
-            PERIOD_OF_GRACE_DISABLED_IN_MS
+           0L
         }
     }
 }