1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index eb4b48bc37..6fed3e5c19 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -466,6 +466,7 @@ module ActiveRecord
 
     # Returns +true+ if the attributes hash has been frozen.
     def frozen?
+      sync_with_transaction_state
       @attributes.frozen?
     end
 
@@ -583,7 +584,7 @@ module ActiveRecord
       end
 
       def thaw
-        if frozen?
+        if @attributes.frozen?
           @attributes = @attributes.dup
         end
       end