diff --git a/CHANGES.md b/CHANGES.md
index 0530a0bcf7..c16729c428 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -45,6 +45,7 @@
 - Fix cache issues with share-links [Taiga #5559](https://tree.taiga.io/project/penpot/issue/5559)
 - Makes height priority for the rows/columns grids [#2774](https://github.com/penpot/penpot/issues/2774)
 - Fix problem with comments mode not staying [#3363](https://github.com/penpot/penpot/issues/3363)
+- Fix problem with comments when user left the team [Taiga #5562](https://tree.taiga.io/project/penpot/issue/5562)
 
 ### :arrow_up: Deps updates
 
diff --git a/frontend/src/app/main/data/comments.cljs b/frontend/src/app/main/data/comments.cljs
index e85e04f3ac..ce58747df3 100644
--- a/frontend/src/app/main/data/comments.cljs
+++ b/frontend/src/app/main/data/comments.cljs
@@ -282,7 +282,7 @@
            (fetched [[users comments] state]
              (let [state (-> state
                              (assoc :comment-threads (d/index-by :id comments))
-                             (assoc :current-file-comments-users (d/index-by :id users)))]
+                             (update :current-file-comments-users merge (d/index-by :id users)))]
                (reduce set-comment-threds state comments)))]
 
     (ptk/reify ::retrieve-comment-threads