diff --git a/lib/global_id/uri/gid.rb b/lib/global_id/uri/gid.rb
index 20a22a7..8af8feb 100644
--- a/lib/global_id/uri/gid.rb
+++ b/lib/global_id/uri/gid.rb
@@ -62,7 +62,7 @@ def validate_app(app)
       #   URI.parse('gid://bcx')       # => URI::GID instance
       #   URI::GID.parse('gid://bcx/') # => raises URI::InvalidComponentError
       def parse(uri)
-        generic_components = URI.split(uri) << nil << true # nil parser, true arg_check
+        generic_components = URI.split(uri) << URI::RFC2396_Parser.new << true # nil parser, true arg_check
         new(*generic_components)
       end