diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index faa851c8144..cb0339b9884 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -353,14 +353,10 @@ def create_tax_charge!
     end
 
     def outstanding_balance
-      # If reimbursement has happened add it back to total to prevent balance_due payment state
-      # See: https://github.com/spree/spree/issues/6229
-      adjusted_payment_total = payment_total + refund_total
-
       if state == 'canceled'
-        -1 * adjusted_payment_total
+        -1 * payment_total
       else
-        total - adjusted_payment_total
+        total - payment_total
       end
     end
 
diff --git a/core/spec/models/spree/order/payment_spec.rb b/core/spec/models/spree/order/payment_spec.rb
index 727902b0573..dfb1edf3742 100644
--- a/core/spec/models/spree/order/payment_spec.rb
+++ b/core/spec/models/spree/order/payment_spec.rb
@@ -154,48 +154,43 @@ module Spree
       it { is_expected.to be_truthy }
     end
 
-    context "#outstanding_balance" do
-      it "should return positive amount when payment_total is less than total" do
-        order.payment_total = 20.20
-        order.total = 30.30
-        expect(order.outstanding_balance).to eq(10.10)
-      end
-      it "should return negative amount when payment_total is greater than total" do
-        order.total = 8.20
-        order.payment_total = 10.20
-        expect(order.outstanding_balance).to be_within(0.001).of(-2.00)
-      end
-
-      context "with reimburesements on the order" do
-        let(:amount) { 10.0 }
-        let(:reimbursement) { create(:reimbursement) }
-        let(:order) { reimbursement.order.reload }
-
-        before do
-          # Set the payment amount to actually be the order total of 110
-          reimbursement.order.payments.first.update_column :amount, amount
-          # Creates a refund of 110
-          create :refund, amount: amount,
-                          payment: reimbursement.order.payments.first,
-                          reimbursement: reimbursement
-          # Update the order totals so payment_total goes to 0 reflecting the refund..
-          order.update!
-        end
+    context "with reimburesements on the order" do
+      let(:amount_paid) { 20.0 }
+      let(:amount_refunded) { 10.0 }
+      let(:order) { create(:order_with_line_items) }
+      let(:reimbursement) { create(:reimbursement) }
+      let(:payment) do
+        create(:payment, amount: amount_paid, state: :completed, order: order)
+      end
+
+      before do
+        reimbursement.order = order
 
-        context "for canceled orders" do
-          before { order.update_attributes(state: 'canceled') }
+        create(:refund, {
+          amount: amount_refunded,
+          payment: payment,
+          reimbursement: reimbursement
+        })
 
-          it "it should be a negative amount incorporating reimbursements" do
-            expect(order.outstanding_balance).to eq(-10)
-          end
+        # Invoke OrderUpdater to update payment_total
+        order.update!
+      end
+
+      context "for canceled orders" do
+        before { order.update_attributes(state: 'canceled') }
+
+        it "it should be a negative amount incorporating reimbursements" do
+          # -1 * (Payment Total + Reimbursed)
+          # -1 * (20 - 10) = -10
+          expect(order.outstanding_balance).to eq(-10)
         end
+      end
 
-        context "for non-canceled orders" do
-          it 'should incorporate refund reimbursements' do
-            # Order Total - (Payment Total + Reimbursed)
-            # 110 - (0 + 10) = 100
-            expect(order.outstanding_balance).to eq 100
-          end
+      context "for non-canceled orders" do
+        it 'should incorporate refund reimbursements' do
+          # Order Total - (Payment Total + Reimbursed)
+          # 110 - (20 - 10) = 100
+          expect(order.outstanding_balance).to eq 100
         end
       end
     end