1 files changed, 12 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
index 061628725d..ebaaa54b2b 100644
--- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
+++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
@@ -20,7 +20,7 @@ module ActiveRecord
               nil
             end
           else
-            map(super) { |t| cast(t) }
+            map_avoiding_infinite_recursion(super) { |v| cast(v) }
           end
         end
 
@@ -34,13 +34,23 @@ module ActiveRecord
           elsif value.is_a?(::Float)
             value
           else
-            map(value) { |v| convert_time_to_time_zone(v) }
+            map_avoiding_infinite_recursion(value) { |v| convert_time_to_time_zone(v) }
           end
         end
 
         def set_time_zone_without_conversion(value)
           ::Time.zone.local_to_utc(value).in_time_zone
         end
+
+        def map_avoiding_infinite_recursion(value)
+          map(value) do |v|
+            if value.equal?(v)
+              nil
+            else
+              yield(v)
+            end
+          end
+        end
       end
 
       extend ActiveSupport::Concern