diff --git a/src/Http/Http.Abstractions/src/Internal/HeaderSegmentCollection.cs b/src/Http/Http.Abstractions/src/Internal/HeaderSegmentCollection.cs
index b83bf4eeea..e06ae7b012 100644
--- a/src/Http/Http.Abstractions/src/Internal/HeaderSegmentCollection.cs
+++ b/src/Http/Http.Abstractions/src/Internal/HeaderSegmentCollection.cs
@@ -254,6 +254,11 @@ namespace Microsoft.AspNetCore.Http
                                 switch (attr)
                                 {
                                     case Attr.Delimiter:
+                                        if (ch == (char)0)
+                                        {
+                                            _valueEnd = _offset;
+                                            _trailingStart = _offset;
+                                        }
                                         _mode = Mode.Produce;
                                         break;
                                     case Attr.Quote:
diff --git a/src/Http/Http/test/HeaderDictionaryTests.cs b/src/Http/Http/test/HeaderDictionaryTests.cs
index 26113f53c0..e9cf32ebe3 100644
--- a/src/Http/Http/test/HeaderDictionaryTests.cs
+++ b/src/Http/Http/test/HeaderDictionaryTests.cs
@@ -103,5 +103,18 @@ namespace Microsoft.AspNetCore.Http
             Assert.Throws<InvalidOperationException>(() => headers.Remove(new KeyValuePair<string, StringValues>("header1", "value1")));
             Assert.Throws<InvalidOperationException>(() => headers.Remove("header1"));
         }
+
+        [Fact]
+        public void GetCommaSeparatedValues_WorksForUnquotedHeaderValuesEndingWithSpace()
+        {
+            var headers = new HeaderDictionary
+            {
+                { "Via", "value " },
+            };
+
+            var result = headers.GetCommaSeparatedValues("Via");
+
+            Assert.Equal(new[]{"value "}, result);
+        }
     }
-}
\ No newline at end of file
+}