1 files changed, 6 insertions, 2 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/JsonHandler.cs b/MediaBrowser.Api/HttpHandlers/JsonHandler.cs
index 06ce4c2d4..bffa84174 100644
--- a/MediaBrowser.Api/HttpHandlers/JsonHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/JsonHandler.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using System.Threading.Tasks;
 using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Common.Serialization;
 
@@ -8,9 +9,12 @@ namespace MediaBrowser.Api.HttpHandlers
     {
         protected abstract object ObjectToSerialize { get; }
 
-        protected override void WriteResponseToOutputStream(Stream stream)
+        protected override Task WriteResponseToOutputStream(Stream stream)
         {
-            JsonSerializer.SerializeToStream(ObjectToSerialize, stream);
+            return Task.Run(() =>
+            {
+                JsonSerializer.SerializeToStream(ObjectToSerialize, stream);
+            });
         }
     }
 }