1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/template/resolver.rb b/actionview/lib/action_view/template/resolver.rb
index 1c463efbb2..f2b8b1166d 100644
--- a/actionview/lib/action_view/template/resolver.rb
+++ b/actionview/lib/action_view/template/resolver.rb
@@ -294,12 +294,12 @@ module ActionView
           if handler.respond_to?(:default_format) # default_format can return nil
             handler.default_format
           else
-            query_format
+            nil
           end
         end
 
         # Template::Types[format] and handler.default_format can return nil
-        [handler, format || query_format, variant]
+        [handler, format, variant]
       end
   end