diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Debouncer.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Debouncer.kt
index ba966b18a2..575551da1b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Debouncer.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/Debouncer.kt
@@ -23,12 +23,9 @@ internal class Debouncer(private val handler: Handler) {
     private val runnables = HashMap<String, Runnable>()
 
     fun debounce(identifier: String, r: Runnable, millis: Long): Boolean {
-        if (runnables.containsKey(identifier)) {
-            // debounce
-            runnables[identifier]?.let {
-                handler.removeCallbacks(it)
-            }
-        }
+        // debounce
+        runnables[identifier]?.let { runnable -> handler.removeCallbacks(runnable) }
+
         insertRunnable(identifier, r, millis)
         return true
     }