diff --git a/src/Nancy/NancyEngine.cs b/src/Nancy/NancyEngine.cs
index ba57d8df7d..abf51ff276 100644
--- a/src/Nancy/NancyEngine.cs
+++ b/src/Nancy/NancyEngine.cs
@@ -115,9 +115,16 @@ public Task<NancyContext> HandleRequest(Request request, Func<NancyContext, Nanc
             var staticContentResponse = this.staticContentProvider.GetContent(context);
             if (staticContentResponse != null)
             {
-                context.Response = staticContentResponse;
-                tcs.SetResult(context);
-                return tcs.Task;
+                try
+                {
+                    context.Response = staticContentResponse;
+                    tcs.SetResult(context);
+                    return tcs.Task;
+                }
+                finally
+                {
+                    cts.Dispose();
+                }
             }
 
             var pipelines = this.RequestPipelinesFactory.Invoke(context);
@@ -147,7 +154,14 @@ public Task<NancyContext> HandleRequest(Request request, Func<NancyContext, Nanc
                 },
                 errorTask =>
                 {
-		            tcs.SetException(errorTask.Exception);
+                    try
+                    {
+                        tcs.SetException(errorTask.Exception);
+                    }
+                    finally
+                    {
+                        cts.Dispose();
+                    }
                 },
                 true);