2 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/journey/router/utils.rb b/actionpack/lib/action_dispatch/journey/router/utils.rb
index 1ac86d10d6..3336036a03 100644
--- a/actionpack/lib/action_dispatch/journey/router/utils.rb
+++ b/actionpack/lib/action_dispatch/journey/router/utils.rb
@@ -13,6 +13,7 @@ module ActionDispatch
         #   normalize_path("")      # => "/"
         #   normalize_path("/%ab")  # => "/%AB"
         def self.normalize_path(path)
+          path ||= ''
           encoding = path.encoding
           path = "/#{path}".dup
           path.squeeze!("/".freeze)
diff --git a/actionpack/test/journey/router/utils_test.rb b/actionpack/test/journey/router/utils_test.rb
index 08268782d9..646563f7ab 100644
--- a/actionpack/test/journey/router/utils_test.rb
+++ b/actionpack/test/journey/router/utils_test.rb
@@ -38,6 +38,10 @@ module ActionDispatch
           path = "/foo%AAbar%AAbaz".b
           assert_equal Encoding::ASCII_8BIT, Utils.normalize_path(path).encoding
         end
+
+        def test_normalize_path_with_nil
+          assert_equal '/', Utils.normalize_path(nil)
+        end
       end
     end
   end