diff --git a/app/models/spree/gateway/stripe_connect.rb b/app/models/spree/gateway/stripe_connect.rb
index 06a632c04a..7745ca708e 100644
--- a/app/models/spree/gateway/stripe_connect.rb
+++ b/app/models/spree/gateway/stripe_connect.rb
@@ -31,6 +31,11 @@ module Spree
         provider.purchase(*options_for_purchase_or_auth(money, creditcard, gateway_options))
       end
 
+      def void(response_code, creditcard, gateway_options)
+        gateway_options[:stripe_account] = stripe_account_id
+        provider.void(response_code, gateway_options)
+      end
+
       def create_profile(payment)
         return unless payment.source.gateway_customer_profile_id.nil?
         options = {
diff --git a/spec/controllers/spree/admin/payments_controller_spec.rb b/spec/controllers/spree/admin/payments_controller_spec.rb
new file mode 100644
index 0000000000..79a6e0ed65
--- /dev/null
+++ b/spec/controllers/spree/admin/payments_controller_spec.rb
@@ -0,0 +1,72 @@
+module Spree
+  module Admin
+    describe PaymentsController do
+      let!(:shop) { create(:enterprise) }
+      let!(:user) { shop.owner }
+      let!(:order) { create(:order, distributor: shop) }
+      let!(:line_item) { create(:line_item, order: order, price: 5.0) }
+
+      context "as an enterprise user" do
+        before do
+          allow(controller).to receive(:spree_current_user) { user }
+          order.reload.update_totals
+        end
+
+        context "requesting a refund on a payment" do
+          let(:params) { { id: payment.id, order_id: order.number, e: :void } }
+
+          # Required for the respond override in the controller decorator to work
+          before { @request.env['HTTP_REFERER'] = spree.admin_order_payments_url(payment) }
+
+          context "that was processed by stripe" do
+            let!(:payment_method) { create(:stripe_payment_method, distributors: [shop]) }
+            # let!(:credit_card) { create(:credit_card, gateway_customer_profile_id: "cus_1", gateway_payment_profile_id: 'card_2') }
+            let!(:payment) { create(:payment, order: order, state: 'completed', payment_method: payment_method, response_code: 'ch_1a2b3c', amount: order.total) }
+
+
+            before do
+              allow(Stripe).to receive(:api_key) { "sk_test_12345" }
+            end
+
+            context "where the request succeeds" do
+              before do
+                stub_request(:post, "https://sk_test_12345:@api.stripe.com/v1/charges/ch_1a2b3c/refunds").
+                to_return(:status => 200, :body => JSON.generate(id: 're_123', object: 'refund', status: 'succeeded') )
+              end
+
+              it "voids the payment" do
+                order.reload
+                expect(order.payment_total).to_not eq 0
+                expect(order.outstanding_balance).to eq 0
+                spree_put :fire, params
+                expect(payment.reload.state).to eq 'void'
+                order.reload
+                expect(order.payment_total).to eq 0
+                expect(order.outstanding_balance).to_not eq 0
+              end
+            end
+
+            context "where the request fails" do
+              before do
+                stub_request(:post, "https://sk_test_12345:@api.stripe.com/v1/charges/ch_1a2b3c/refunds").
+                to_return(:status => 200, :body => JSON.generate(error: { message: "Bup-bow!"}) )
+              end
+
+              it "does not void the payment" do
+                order.reload
+                expect(order.payment_total).to_not eq 0
+                expect(order.outstanding_balance).to eq 0
+                spree_put :fire, params
+                expect(payment.reload.state).to eq 'completed'
+                order.reload
+                expect(order.payment_total).to_not eq 0
+                expect(order.outstanding_balance).to eq 0
+                expect(flash[:error]).to eq "Bup-bow!"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end