1 files changed, 9 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 9c30f2a27a..53585740ce 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -129,7 +129,10 @@ module ActionDispatch
                 {}
               end
 
-              defaults[:controller] ||= @options[:controller] || default_controller
+              defaults[:controller] ||= default_controller
+
+              defaults.delete(:controller) if defaults[:controller].blank?
+              defaults.delete(:action)     if defaults[:action].blank?
 
               if defaults[:controller].blank? && segment_keys.exclude?("controller")
                 raise ArgumentError, "missing :controller"
@@ -177,7 +180,11 @@ module ActionDispatch
           end
 
           def default_controller
-            @scope[:controller].to_s if @scope[:controller]
+            if @options[:controller]
+              @options[:controller].to_s
+            elsif @scope[:controller]
+              @scope[:controller].to_s
+            end
           end
       end