diff --git a/app/controllers/cards/comments/reactions_controller.rb b/app/controllers/cards/comments/reactions_controller.rb
index 0a728fbb2..54f63dda7 100644
--- a/app/controllers/cards/comments/reactions_controller.rb
+++ b/app/controllers/cards/comments/reactions_controller.rb
@@ -10,29 +10,16 @@ class Cards::Comments::ReactionsController < ApplicationController
   end
 
   def create
-    reaction = @comment.reactions.create!(params.expect(reaction: :content))
-
-    broadcast_create(reaction)
-    redirect_to card_comment_reactions_path(@card, @comment)
+    @reaction = @comment.reactions.create!(params.expect(reaction: :content))
   end
 
   def destroy
-    reaction = @comment.reactions.find(params[:id])
-    reaction.destroy
-
-    broadcast_remove(reaction)
+    @reaction = @comment.reactions.find(params[:id])
+    @reaction.destroy
   end
 
   private
     def set_comment
       @comment = @card.comments.find(params[:comment_id])
     end
-
-    def broadcast_create(reaction)
-      reaction.broadcast_append_to @card, target: [ @comment, :reactions ], partial: "cards/comments/reactions/reaction"
-    end
-
-    def broadcast_remove(reaction)
-      reaction.broadcast_remove_to @card
-    end
 end
diff --git a/app/views/cards/comments/reactions/create.turbo_stream.erb b/app/views/cards/comments/reactions/create.turbo_stream.erb
new file mode 100644
index 000000000..7ae1f1daa
--- /dev/null
+++ b/app/views/cards/comments/reactions/create.turbo_stream.erb
@@ -0,0 +1 @@
+<%= turbo_stream.append([ @comment, :reactions ], partial: "cards/comments/reactions/reaction", locals: { reaction: @reaction }) %>
diff --git a/app/views/cards/comments/reactions/destroy.turbo_stream.erb b/app/views/cards/comments/reactions/destroy.turbo_stream.erb
new file mode 100644
index 000000000..936436e11
--- /dev/null
+++ b/app/views/cards/comments/reactions/destroy.turbo_stream.erb
@@ -0,0 +1 @@
+<%= turbo_stream.remove @reaction %>
diff --git a/app/views/cards/comments/reactions/new.html.erb b/app/views/cards/comments/reactions/new.html.erb
index 38c6daf98..e847acfbe 100644
--- a/app/views/cards/comments/reactions/new.html.erb
+++ b/app/views/cards/comments/reactions/new.html.erb
@@ -2,7 +2,7 @@
   <%= form_with model: [ @comment.card, @comment, Reaction.new ],
         class: "reaction reaction__form expanded",
         html: { aria: { label: "New reaction" } },
-        data: { controller: "form reaction-emoji", turbo_frame: dom_id(@comment, :reacting), action: "keydown.esc->form#cancel submit->form#preventEmptySubmit" } do |form| %>
+        data: { controller: "form reaction-emoji", turbo_frame: dom_id(@comment, :reacting), action: "keydown.esc->form#cancel submit->form#preventEmptySubmit turbo:submit-end->form#reset" } do |form| %>
     <label class="reaction__form-label flex gap" style="--column-gap: 0.4ch;">
       <figure class="reaction__avatar margin-none flex-item-no-shrink">
         <%= avatar_tag Current.user %>
diff --git a/test/controllers/cards/comments/reactions_controller_test.rb b/test/controllers/cards/comments/reactions_controller_test.rb
index 79d86d62c..4a71affe2 100644
--- a/test/controllers/cards/comments/reactions_controller_test.rb
+++ b/test/controllers/cards/comments/reactions_controller_test.rb
@@ -8,20 +8,17 @@ class Cards::Comments::ReactionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "create" do
-    assert_turbo_stream_broadcasts @card, count: 1 do
-      assert_difference -> { @comment.reactions.count }, 1 do
-        post card_comment_reactions_path(@comment.card, @comment, format: :turbo_stream), params: { reaction: { content: "Great work!" } }
-        assert_redirected_to card_comment_reactions_path(@comment.card, @comment)
-      end
+    assert_difference -> { @comment.reactions.count }, 1 do
+      post card_comment_reactions_path(@comment.card, @comment, format: :turbo_stream), params: { reaction: { content: "Great work!" } }
+      assert_turbo_stream action: :append, target: dom_id(@comment, :reactions)
     end
   end
 
   test "destroy" do
-    assert_turbo_stream_broadcasts @card, count: 1 do
-      assert_difference -> { @comment.reactions.count }, -1 do
-        delete card_comment_reaction_path(@comment.card, @comment, reactions(:kevin), format: :turbo_stream)
-        assert_response :success
-      end
+    reaction = reactions(:kevin)
+    assert_difference -> { @comment.reactions.count }, -1 do
+      delete card_comment_reaction_path(@comment.card, @comment, reaction, format: :turbo_stream)
+      assert_turbo_stream action: :remove, target: dom_id(reaction)
     end
   end
 end