diff --git a/CHANGES.rst b/CHANGES.rst
index 340e75b36..dae048746 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -133,6 +133,7 @@ Changes in 1.0.14 (2020-10-02)
  * Biometrics: Handle retry case.
  * Room: Remove membership events from room creation modal (#3679).
  * PIN: Fix layout on small screens.
+ * PIN: Fix code bypass on fast switching.
 
 ⚠️ API Changes
  * 
diff --git a/Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift b/Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift
index 85526491e..14e97094b 100644
--- a/Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift
+++ b/Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift
@@ -54,7 +54,7 @@ class LocalAuthenticationService: NSObject {
         guard let appLastActiveTime = appLastActiveTime else {
             return true
         }
-        return (systemUptime - appLastActiveTime) > pinCodePreferences.graceTimeInSeconds
+        return (systemUptime - appLastActiveTime) >= pinCodePreferences.graceTimeInSeconds
     }
     
     var isProtectionSet: Bool {