diff --git a/MatrixSDK/Crypto/MXCrypto.m b/MatrixSDK/Crypto/MXCrypto.m
index 44e36e3423..d986e49acb 100644
--- a/MatrixSDK/Crypto/MXCrypto.m
+++ b/MatrixSDK/Crypto/MXCrypto.m
@@ -233,6 +233,11 @@ - (void)start:(void (^)())success
                 MXHTTPOperation *operation2 = [self makeAnnoucement:roomsByUser success:^{
                     dispatch_async(dispatch_get_main_queue(), ^{
                         startOperation = nil;
+
+                        // Make sure we are refreshing devices lists right instead
+                        // of waiting for the next /sync that may occur in 30s.
+                        [_deviceList refreshOutdatedDeviceLists];
+
                         success();
                     });