diff --git a/src/SignalR/server/Core/src/StreamTracker.cs b/src/SignalR/server/Core/src/StreamTracker.cs
index 2d7432ebd6..a507fde54b 100644
--- a/src/SignalR/server/Core/src/StreamTracker.cs
+++ b/src/SignalR/server/Core/src/StreamTracker.cs
@@ -78,7 +78,9 @@ namespace Microsoft.AspNetCore.SignalR
 
             public ChannelConverter()
             {
-                _channel = Channel.CreateUnbounded<T>();
+                // TODO: Make this configurable or figure out a good limit
+                // https://github.com/aspnet/AspNetCore/issues/4399
+                _channel = Channel.CreateBounded<T>(10);
             }
 
             public Type GetItemType()