diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
index a23f58825..1c4cb8c4e 100644
--- a/Config/BuildSettings.swift
+++ b/Config/BuildSettings.swift
@@ -158,6 +158,9 @@ final class BuildSettings: NSObject {
     /// Setting to force protection by pin code
     static let forcePinProtection: Bool = false
     
+    /// Max allowed time to continue using the app without prompting PIN
+    static let pinCodeGraceTimeInSeconds: TimeInterval = 0
+    
     /// Force non-jailbroken app usage
     static let forceNonJailbrokenUsage: Bool = true
     
diff --git a/Riot/Modules/SetPinCode/PinCodePreferences.swift b/Riot/Modules/SetPinCode/PinCodePreferences.swift
index 2dbd34d4d..b42ed028f 100644
--- a/Riot/Modules/SetPinCode/PinCodePreferences.swift
+++ b/Riot/Modules/SetPinCode/PinCodePreferences.swift
@@ -59,7 +59,9 @@ final class PinCodePreferences: NSObject {
     let allowedNumberOfTrialsBeforeAlert: Int = 5
     
     /// Max allowed time to continue using the app without prompting PIN
-    let graceTimeInSeconds: TimeInterval = 0
+    var graceTimeInSeconds: TimeInterval {
+        return BuildSettings.pinCodeGraceTimeInSeconds
+    }
     
     /// Number of digits for the PIN
     let numberOfDigits: Int = 4