diff --git a/ruby/lib/core/uri.rb b/ruby/lib/core/uri.rb
index d5d0dd67a7..c1f5671d75 100644
--- a/ruby/lib/core/uri.rb
+++ b/ruby/lib/core/uri.rb
@@ -46,7 +46,12 @@ class AMQPS < AMQP
 module Qpid::Proton
   private
   # Make sure to allow empty hostnames, Ruby 2.0.0 does not.
-  DEFAULT_URI_PARSER = URI::Parser.new(:HOSTNAME => /(?:#{URI::PATTERN::HOSTNAME})|/)
+  DEFAULT_URI_PARSER =
+    if RUBY_VERSION >= '3.4'
+      URI::RFC2396_Parser.new(:HOSTNAME => /(?:#{URI::PATTERN::HOSTNAME})|/)
+    else
+      URI::Parser.new(:HOSTNAME => /(?:#{URI::PATTERN::HOSTNAME})|/)
+    end
 
   public