diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index ebeafcad2..2a31a1013 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -301,6 +301,7 @@
 
       (when show-comments?
         [:> comments/comments-layer* {:vbox vbox
+                                      :page-id page-id
                                       :file-id file-id
                                       :vport vport
                                       :zoom zoom
diff --git a/frontend/src/app/main/ui/workspace/viewport/comments.cljs b/frontend/src/app/main/ui/workspace/viewport/comments.cljs
index 74ceafbae..c68cb9af1 100644
--- a/frontend/src/app/main/ui/workspace/viewport/comments.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/comments.cljs
@@ -16,7 +16,7 @@
    [rumext.v2 :as mf]))
 
 (mf/defc comments-layer*
-  [{:keys [vbox vport zoom drawing file-id]}]
+  [{:keys [vbox vport zoom drawing file-id page-id]}]
   (let [vbox-x      (dm/get-prop vbox :x)
         vbox-y      (dm/get-prop vbox :y)
         vport-w     (dm/get-prop vport :width)
@@ -31,8 +31,9 @@
         threads-map (mf/deref refs/threads)
 
         threads
-        (mf/with-memo [threads-map local profile]
+        (mf/with-memo [threads-map local profile page-id]
           (->> (vals threads-map)
+               (filter #(= (:page-id %) page-id))
                (dcm/apply-filters local profile)))
 
         viewport
diff --git a/frontend/src/app/main/ui/workspace/viewport_wasm.cljs b/frontend/src/app/main/ui/workspace/viewport_wasm.cljs
index d74fea809..3de0c4c9d 100644
--- a/frontend/src/app/main/ui/workspace/viewport_wasm.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport_wasm.cljs
@@ -348,6 +348,7 @@
 
       (when show-comments?
         [:> comments/comments-layer* {:vbox vbox
+                                      :page-id page-id
                                       :vport vport
                                       :zoom zoom
                                       :drawing drawing}])