1 files changed, 8 insertions, 1 deletions
diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index 4099c9c56..e68fee829 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -234,7 +234,14 @@ namespace MediaBrowser.Common.Implementations
 
             JsonSerializer = CreateJsonSerializer();
 
-            MemoryStreamProvider = new MemoryStreamProvider();
+            if (Environment.OSVersion.Platform == PlatformID.Win32NT)
+            {
+                MemoryStreamProvider = new RecyclableMemoryStreamProvider();
+            }
+            else
+            {
+                MemoryStreamProvider = new MemoryStreamProvider();
+            }
 
             OnLoggerLoaded(true);
             LogManager.LoggerLoaded += (s, e) => OnLoggerLoaded(false);