diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index c8076af0c8ab7bf4457899ef608a74ccd5431cb1..1974bbf529cdd3ae52361baead7648fc6728ff36 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -532,7 +532,7 @@ def method_missing(name, *args, &block)
 
         def variant
           if @variant.nil?
-            @variants[:none]
+            @variants[:none] || @variants[:any]
           elsif (@variants.keys & @variant).any?
             @variant.each do |v|
               return @variants[v] if @variants.key?(v)
diff --git a/actionpack/test/controller/mime/respond_to_test.rb b/actionpack/test/controller/mime/respond_to_test.rb
index 2f05017ec9c2de5bb27dd4c738483755ef5cb5fc..499c62cc35602c1dad1defa0d4d0076e8c2162c3 100644
--- a/actionpack/test/controller/mime/respond_to_test.rb
+++ b/actionpack/test/controller/mime/respond_to_test.rb
@@ -671,6 +671,10 @@ def test_variant_any
   end
 
   def test_variant_any_any
+    get :variant_any_any
+    assert_equal "text/html", @response.content_type
+    assert_equal "any", @response.body
+
     @request.variant = :phone
     get :variant_any_any
     assert_equal "text/html", @response.content_type