diff --git a/app/controllers/cards/watches_controller.rb b/app/controllers/cards/watches_controller.rb
index 4d83567d0..9d314dedf 100644
--- a/app/controllers/cards/watches_controller.rb
+++ b/app/controllers/cards/watches_controller.rb
@@ -7,9 +7,19 @@ class Cards::WatchesController < ApplicationController
 
   def create
     @card.watch_by Current.user
+
+    respond_to do |format|
+      format.turbo_stream
+      format.json { head :no_content }
+    end
   end
 
   def destroy
     @card.unwatch_by Current.user
+
+    respond_to do |format|
+      format.turbo_stream
+      format.json { head :no_content }
+    end
   end
 end
diff --git a/test/controllers/cards/watches_controller_test.rb b/test/controllers/cards/watches_controller_test.rb
index 5440a326b..7bcd82c3d 100644
--- a/test/controllers/cards/watches_controller_test.rb
+++ b/test/controllers/cards/watches_controller_test.rb
@@ -9,7 +9,7 @@ class Cards::WatchesControllerTest < ActionDispatch::IntegrationTest
     cards(:logo).unwatch_by users(:kevin)
 
     assert_changes -> { cards(:logo).watched_by?(users(:kevin)) }, from: false, to: true do
-      post card_watch_path(cards(:logo))
+      post card_watch_path(cards(:logo)), as: :turbo_stream
     end
   end
 
@@ -17,7 +17,31 @@ class Cards::WatchesControllerTest < ActionDispatch::IntegrationTest
     cards(:logo).watch_by users(:kevin)
 
     assert_changes -> { cards(:logo).watched_by?(users(:kevin)) }, from: true, to: false do
-      delete card_watch_path(cards(:logo))
+      delete card_watch_path(cards(:logo)), as: :turbo_stream
     end
   end
+
+  test "create as JSON" do
+    card = cards(:logo)
+    card.unwatch_by users(:kevin)
+
+    assert_not card.watched_by?(users(:kevin))
+
+    post card_watch_path(card), as: :json
+
+    assert_response :no_content
+    assert card.reload.watched_by?(users(:kevin))
+  end
+
+  test "destroy as JSON" do
+    card = cards(:logo)
+    card.watch_by users(:kevin)
+
+    assert card.watched_by?(users(:kevin))
+
+    delete card_watch_path(card), as: :json
+
+    assert_response :no_content
+    assert_not card.reload.watched_by?(users(:kevin))
+  end
 end