1 files changed, 7 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/tags/datetime_field.rb b/actionview/lib/action_view/helpers/tags/datetime_field.rb
index 25e7e05ec6..4296e52f21 100644
--- a/actionview/lib/action_view/helpers/tags/datetime_field.rb
+++ b/actionview/lib/action_view/helpers/tags/datetime_field.rb
@@ -5,8 +5,8 @@ module ActionView
         def render
           options = @options.stringify_keys
           options["value"] ||= format_date(value(object))
-          options["min"] = format_date(options["min"])
-          options["max"] = format_date(options["max"])
+          options["min"] = format_date(datetime_value(options["min"]))
+          options["max"] = format_date(datetime_value(options["max"]))
           @options = options
           super
         end
@@ -16,6 +16,11 @@ module ActionView
           def format_date(value)
             value.try(:strftime, "%Y-%m-%dT%T.%L%z")
           end
+
+          def datetime_value(value)
+            return value unless value.is_a? String
+            DateTime.parse(value) rescue nil
+          end
       end
     end
   end