diff --git a/src/Microsoft.AspNetCore.Sockets.Http/LongPollingOptions.cs b/src/Microsoft.AspNetCore.Sockets.Http/LongPollingOptions.cs
index 12d232011e..ac3718e210 100644
--- a/src/Microsoft.AspNetCore.Sockets.Http/LongPollingOptions.cs
+++ b/src/Microsoft.AspNetCore.Sockets.Http/LongPollingOptions.cs
@@ -6,6 +6,6 @@ namespace Microsoft.AspNetCore.Sockets
 {
     public class LongPollingOptions
     {
-        public TimeSpan PollTimeout { get; set; } = TimeSpan.FromSeconds(110);
+        public TimeSpan PollTimeout { get; set; } = TimeSpan.FromSeconds(90);
     }
 }
diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/LongPollingTests.cs b/test/Microsoft.AspNetCore.Sockets.Tests/LongPollingTests.cs
index b1824f34ad..3e88995ef5 100644
--- a/test/Microsoft.AspNetCore.Sockets.Tests/LongPollingTests.cs
+++ b/test/Microsoft.AspNetCore.Sockets.Tests/LongPollingTests.cs
@@ -101,5 +101,12 @@ namespace Microsoft.AspNetCore.Sockets.Tests
             var payload = ms.ToArray();
             Assert.Equal("Hello World", Encoding.UTF8.GetString(payload));
         }
+
+        [Fact]
+        public void CheckLongPollingTimeoutValue()
+        {
+            var options = new HttpSocketOptions();
+            Assert.Equal(options.LongPolling.PollTimeout, TimeSpan.FromSeconds(90));
+        }
     }
 }