diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
index da6d838b76..237c8c218d 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
@@ -139,7 +139,7 @@ class DevicesViewModel @AssistedInject constructor(
         session.rx().liveUserCryptoDevices(session.myUserId)
                 .map { it.size }
                 .distinctUntilChanged()
-                .throttleFirst(5_000, TimeUnit.MILLISECONDS)
+                .throttleLast(5_000, TimeUnit.MILLISECONDS)
                 .subscribe {
                     // If we have a new crypto device change, we might want to trigger refresh of device info
                     session.cryptoService().fetchDevicesList(NoOpMatrixCallback())