diff --git a/ElementX/Sources/Services/Client/ClientProxy.swift b/ElementX/Sources/Services/Client/ClientProxy.swift
index cc628eadc..74ced3929 100644
--- a/ElementX/Sources/Services/Client/ClientProxy.swift
+++ b/ElementX/Sources/Services/Client/ClientProxy.swift
@@ -106,7 +106,13 @@ class ClientProxy: ClientProxyProtocol {
     }
 
     var isSyncing: Bool {
-        roomListService?.isSyncing() ?? false && isEncryptionSyncing
+        let isRoomListServiceSyncing = roomListService?.isSyncing() ?? false
+        
+        if ServiceLocator.shared.settings.isEncryptionSyncEnabled {
+            return isRoomListServiceSyncing && isEncryptionSyncing
+        } else {
+            return isRoomListServiceSyncing
+        }
     }
     
     func startSync() {