diff --git a/app/assets/stylesheets/comments.css b/app/assets/stylesheets/comments.css
index 6720fa258..78ec57467 100644
--- a/app/assets/stylesheets/comments.css
+++ b/app/assets/stylesheets/comments.css
@@ -82,10 +82,6 @@
 
   .comment__edit {
     background-color: var(--color-ink-lightest);
-
-    .comment:not(.comment--mine) & {
-      display: none;
-    }
   }
 
   .comment--mine {
diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb
index 9dae7757c..f0e774882 100644
--- a/app/helpers/messages_helper.rb
+++ b/app/helpers/messages_helper.rb
@@ -3,10 +3,6 @@ module MessagesHelper
     turbo_frame_tag dom_id(card, :messages),
       class: "comments gap center",
       style: "--card-color: #{card.color}",
-      role: "group", aria: { label: "Messages" },
-      data: {
-        controller: "created-by-current-user",
-        created_by_current_user_mine_class: "comment--mine"
-      }, &
+      role: "group", aria: { label: "Messages" }, &
   end
 end
diff --git a/app/javascript/controllers/created_by_current_user_controller.js b/app/javascript/controllers/created_by_current_user_controller.js
deleted file mode 100644
index 8941fc120..000000000
--- a/app/javascript/controllers/created_by_current_user_controller.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Controller } from "@hotwired/stimulus"
-
-export default class extends Controller {
-  static targets = [ "creation" ]
-  static classes = [ "mine" ]
-
-  creationTargetConnected(element) {
-    if (element.dataset.creatorId == Current.user.id) {
-      element.classList.add(this.mineClass)
-    }
-  }
-}
diff --git a/app/views/cards/comments/_comment.html.erb b/app/views/cards/comments/_comment.html.erb
index 94bb5eec4..49ae74182 100644
--- a/app/views/cards/comments/_comment.html.erb
+++ b/app/views/cards/comments/_comment.html.erb
@@ -1,7 +1,7 @@
 <% cache comment do %>
   <%= turbo_frame_tag comment, :container do %>
     <%# Bump for CSS changes: 2025-06-30 -%>
-    <div id="<%= dom_id(comment) %>" class="comment flex align-start full-width <%= "comment--system" if comment.creator.system? %>" data-creator-id="<%= comment.creator_id %>" data-created-by-current-user-target="creation">
+    <div id="<%= dom_id(comment) %>" data-creator-id="<%= comment.creator_id %>"  class="comment flex align-start full-width <%= "comment--system" if comment.creator.system? %>">
       <figure class="comment__avatar flex-item-no-shrink" aria-hidden="true">
         <%= avatar_tag comment.creator, hidden_for_screen_reader: true %>
       </figure>
@@ -20,7 +20,7 @@
           </h3>
 
           <%= link_to edit_card_comment_path(comment.card, comment),
-                class: "comment__edit btn btn--circle borderless translucent" do %>
+                class: "comment__edit btn btn--circle borderless translucent", data: { only_visible_to_you: true } do %>
             <%= icon_tag "menu-dots-horizontal" %>
             <span class="for-screen-reader">Edit this comment</span>
           <% end %>