diff --git a/app/controllers/cards/images_controller.rb b/app/controllers/cards/images_controller.rb
index fad419c52..f4fec16d5 100644
--- a/app/controllers/cards/images_controller.rb
+++ b/app/controllers/cards/images_controller.rb
@@ -3,6 +3,10 @@ class Cards::ImagesController < ApplicationController
 
   def destroy
     @card.image.purge_later
-    redirect_to @card
+
+    respond_to do |format|
+      format.html { redirect_to @card }
+      format.json { head :no_content }
+    end
   end
 end
diff --git a/test/controllers/cards/images_controller_test.rb b/test/controllers/cards/images_controller_test.rb
new file mode 100644
index 000000000..5dbedcf22
--- /dev/null
+++ b/test/controllers/cards/images_controller_test.rb
@@ -0,0 +1,31 @@
+require "test_helper"
+
+class Cards::ImagesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "destroy" do
+    card = cards(:logo)
+    card.image.attach(io: file_fixture("moon.jpg").open, filename: "moon.jpg")
+
+    assert card.image.attached?
+
+    delete card_image_path(card)
+
+    assert_redirected_to card
+    assert_not card.reload.image.attached?
+  end
+
+  test "destroy as JSON" do
+    card = cards(:logo)
+    card.image.attach(io: file_fixture("moon.jpg").open, filename: "moon.jpg")
+
+    assert card.image.attached?
+
+    delete card_image_path(card), as: :json
+
+    assert_response :no_content
+    assert_not card.reload.image.attached?
+  end
+end