diff --git a/app/models/invoice.rb b/app/models/invoice.rb
index a5c3f3f85..edd85108d 100644
--- a/app/models/invoice.rb
+++ b/app/models/invoice.rb
@@ -160,6 +160,7 @@ class Invoice < ActiveRecord::Base
 
   def total
     calculate_total unless total?
+    read_attribute(:total)
   end
 
   private
diff --git a/test/models/invoice_test.rb b/test/models/invoice_test.rb
index 9222f83b8..c9e1f9f11 100644
--- a/test/models/invoice_test.rb
+++ b/test/models/invoice_test.rb
@@ -76,6 +76,10 @@ class InvoiceTest < ActiveSupport::TestCase
     end
   end
 
+  def test_returns_persisted_total
+    assert_equal BigDecimal('16.50'), @invoice.total
+  end
+
   def test_calculates_total
     line_item = InvoiceItem.new
     invoice = Invoice.new