diff --git a/src/chat/chat_sync.c b/src/chat/chat_sync.c
index f80872cd..e79a90b3 100644
--- a/src/chat/chat_sync.c
+++ b/src/chat/chat_sync.c
@@ -357,7 +357,7 @@ static void cs_flush_sync(struct chat_sync* cs) {
             if (pid == myid || !cs_is_peer_online(cs->inst, pid)) continue;
             DEBUG_DEBUG(DEBUG_CATEGORY_MEMBER_SYNC, "%s: flush_sync start for peer=%016llx ch=%s",
                         CS_ID, (unsigned long long)pid, ch->channel_id);
-            member_sync_start(cs->inst, pid, ch->channel_id, _on_member_sync_done, ch);
+            member_sync_start(cs->inst, pid, ch->channel_id, _on_member_sync_done, NULL);
         }
     }
 }
@@ -416,9 +416,12 @@ static void cs_resume_db_sync(const char* ch_id) {
 }
 
 static void _on_member_sync_done(uint64_t peer, const char* ns, int result, void* arg) {
-    struct channel_cache* ch = (struct channel_cache*)arg;
-    if (result == MT_OK && ch) ch->synced = CS_SYNC_DONE;
-    if (result == MT_OK) cs_resume_db_sync(ns);
+    (void)arg;
+    if (result == MT_OK) {
+        struct channel_cache* ch = g_cs ? cs_find(g_cs, ns) : NULL;
+        if (ch) ch->synced = CS_SYNC_DONE;
+        cs_resume_db_sync(ns);
+    }
     DEBUG_INFO(DEBUG_CATEGORY_MEMBER_SYNC, "%s: member_sync %s ns=%s peer=%016llx",
                CS_ID, result == MT_OK ? "OK" : "FAIL", ns, (unsigned long long)peer);
 }