1 files changed, 6 insertions, 5 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs b/MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs
index da397fec9..fd85993c8 100644
--- a/MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs
@@ -107,17 +107,18 @@ namespace MediaBrowser.Api.HttpHandlers
             }
         }
 
-        public override void ProcessRequest(HttpListenerContext ctx)
+        public override async Task ProcessRequest(HttpListenerContext ctx)
         {
             HttpListenerContext = ctx;
 
             if (!RequiresConversion())
             {
-                new StaticFileHandler() { Path = LibraryItem.Path }.ProcessRequest(ctx);
-                return;
+                await new StaticFileHandler() { Path = LibraryItem.Path }.ProcessRequest(ctx);
+            }
+            else
+            {
+                await base.ProcessRequest(ctx);
             }
-
-            base.ProcessRequest(ctx);
         }
 
         protected abstract string GetCommandLineArguments();