diff --git a/vector/src/main/java/im/vector/app/features/analytics/DecryptionFailureTracker.kt b/vector/src/main/java/im/vector/app/features/analytics/DecryptionFailureTracker.kt
index 988e49023af..d596741d532 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/DecryptionFailureTracker.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/DecryptionFailureTracker.kt
@@ -40,8 +40,8 @@ private data class DecryptionFailure(
 )
 private typealias DetailedErrorName = Pair<String, Error.Name>
 
-private const val GRACE_PERIOD_MILLIS = 30_000
-private const val CHECK_INTERVAL = 40_000L
+private const val GRACE_PERIOD_MILLIS = 4_000
+private const val CHECK_INTERVAL = 2_000L
 
 /**
  * Tracks decryption errors that are visible to the user.