diff --git a/src/libraries/System.Net.Quic/ref/System.Net.Quic.cs b/src/libraries/System.Net.Quic/ref/System.Net.Quic.cs
index 87dfec1d00bcf1..88e4862071c600 100644
--- a/src/libraries/System.Net.Quic/ref/System.Net.Quic.cs
+++ b/src/libraries/System.Net.Quic/ref/System.Net.Quic.cs
@@ -156,7 +156,7 @@ public sealed partial class ManagedQuicListener : System.Net.Quic.QuicListener,
     {
         internal ManagedQuicListener() : base (default(bool)) { }
         public static new bool IsSupported { get { throw null; } }
-        public System.Net.IPEndPoint ListenEndPoint { get { throw null; } }
+        public override System.Net.IPEndPoint LocalEndPoint { get { throw null; } }
         public override System.Threading.Tasks.ValueTask<System.Net.Quic.QuicConnection> AcceptConnectionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask DisposeAsync() { throw null; }
         public static new System.Threading.Tasks.ValueTask<System.Net.Quic.QuicListener> ListenAsync(System.Net.Quic.QuicListenerOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
diff --git a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/Managed/ManagedQuicListener.cs b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/Managed/ManagedQuicListener.cs
index 86e88e6be272ee..c906e3c5704949 100644
--- a/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/Managed/ManagedQuicListener.cs
+++ b/src/libraries/System.Net.Quic/src/System/Net/Quic/Implementations/Managed/ManagedQuicListener.cs
@@ -27,8 +27,6 @@ private ManagedQuicListener(QuicListenerOptions options)
         {
             options.Validate(nameof(options));
 
-            var listenEndPoint = options.ListenEndPoint ?? new IPEndPoint(IPAddress.Any, 0);
-
             var channel = Channel.CreateBounded<ManagedQuicConnection>(new BoundedChannelOptions(options.ListenBacklog)
             {
                 SingleReader = true,
@@ -37,11 +35,11 @@ private ManagedQuicListener(QuicListenerOptions options)
             });
 
             _acceptQueue = channel.Reader;
-            _socketContext = new QuicServerSocketContext(listenEndPoint, options, channel.Writer, TlsFactory.Default);
+            _socketContext = new QuicServerSocketContext(options.ListenEndPoint, options, channel.Writer, TlsFactory.Default);
             _socketContext.Start();
         }
 
-        public IPEndPoint ListenEndPoint => _socketContext.LocalEndPoint;
+        public override IPEndPoint LocalEndPoint => _socketContext.LocalEndPoint;
 
         public override async ValueTask<QuicConnection> AcceptConnectionAsync(CancellationToken cancellationToken = default)
         {