diff --git a/CHANGES.md b/CHANGES.md
index 508f9a635..b3d96067f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,6 +26,7 @@
 - Fix merge path nodes with only one node selected [Taiga #9626](https://tree.taiga.io/project/penpot/issue/9626)
 - Fix problem with import errors [Taiga #10040](https://tree.taiga.io/project/penpot/issue/10040)
 - Fix color gradient on texts [Taiga Issue #7488](https://tree.taiga.io/project/penpot/issue/7488)
+- Add support for self mentions [Taiga #10809](https://tree.taiga.io/project/penpot/issue/10809)
 
 ## 2.6.2 (Unreleased)
 
diff --git a/frontend/src/app/main/ui/comments.cljs b/frontend/src/app/main/ui/comments.cljs
index 1aa3c833e..5b384d8c5 100644
--- a/frontend/src/app/main/ui/comments.cljs
+++ b/frontend/src/app/main/ui/comments.cljs
@@ -450,7 +450,6 @@
 (mf/defc mentions-panel*
   []
   (let [mentions-s (mf/use-ctx mentions-context)
-        profile    (mf/deref refs/profile)
 
         team       (mf/deref refs/team)
         members    (:members team)
@@ -467,13 +466,11 @@
         mentions-users
         (mf/with-memo [mention-filter members]
           (->> members
-               (filter (fn [{:keys [id fullname email]}]
-                         (and
-                          (not= id (:id profile))
-                          (or (not mention-filter)
-                              (empty? mention-filter)
-                              (str/includes? (str/lower fullname) (str/lower mention-filter))
-                              (str/includes? (str/lower email) (str/lower mention-filter))))))
+               (filter (fn [{:keys [fullname email]}]
+                         (or (not mention-filter)
+                             (empty? mention-filter)
+                             (str/includes? (str/lower fullname) (str/lower mention-filter))
+                             (str/includes? (str/lower email) (str/lower mention-filter)))))
                (take 4)
                (into [])))