diff --git a/src/Servers/HttpSys/src/RequestProcessing/Request.cs b/src/Servers/HttpSys/src/RequestProcessing/Request.cs
index ffffc050672cce7df8cba9bd1482b7ca86069981..880beebf562d686115a681dea15d3b860f4ef3c5 100644
--- a/src/Servers/HttpSys/src/RequestProcessing/Request.cs
+++ b/src/Servers/HttpSys/src/RequestProcessing/Request.cs
@@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
         internal ulong RawConnectionId { get; }
 
         // No ulongs in public APIs...
-        public long ConnectionId => (long)RawConnectionId;
+        public long ConnectionId => RawConnectionId != 0 ? (long)RawConnectionId : (long)UConnectionId;
 
         internal ulong RequestId { get; }