diff --git a/snikket/Client.hx b/snikket/Client.hx
index 840912b..80af3c8 100644
--- a/snikket/Client.hx
+++ b/snikket/Client.hx
@@ -109,7 +109,8 @@ class Client extends EventEmitter {
 		});
 
 		stream.on("sm/update", (data) -> {
-			persistence.storeStreamManagement(accountId(), data.sm);
+			final anySyncHappening = chats.exists(chat -> chat.syncing());
+			persistence.storeStreamManagement(accountId(), anySyncHappening ? null : data.sm);
 			return EventHandled;
 		});