diff --git a/samples/StatusCodePagesSample/Startup.cs b/samples/StatusCodePagesSample/Startup.cs
index 010f9910a1..35811cf1a1 100644
--- a/samples/StatusCodePagesSample/Startup.cs
+++ b/samples/StatusCodePagesSample/Startup.cs
@@ -69,7 +69,8 @@ namespace StatusCodePagesSample
                         builder.AppendLine("<a href=\"" + HtmlEncoder.Default.HtmlEncode(referrer) + "\">Retry " + WebUtility.HtmlEncode(referrer) + "</a><br>");
                     }
                     builder.AppendLine("</body></html>");
-                    await context.Response.SendAsync(builder.ToString(), "text/html");
+                    context.Response.ContentType = "text/html";
+                    await context.Response.WriteAsync(builder.ToString());
                 });
             });
 
@@ -94,7 +95,8 @@ namespace StatusCodePagesSample
                 }
 
                 builder.AppendLine("</body></html>");
-                await context.Response.SendAsync(builder.ToString(), "text/html");
+                context.Response.ContentType = "text/html";
+                await context.Response.WriteAsync(builder.ToString());
             });
         }
     }
diff --git a/src/Microsoft.AspNet.Diagnostics/StatusCodePagesExtensions.cs b/src/Microsoft.AspNet.Diagnostics/StatusCodePagesExtensions.cs
index 4b8fb90919..6b604b9af6 100644
--- a/src/Microsoft.AspNet.Diagnostics/StatusCodePagesExtensions.cs
+++ b/src/Microsoft.AspNet.Diagnostics/StatusCodePagesExtensions.cs
@@ -60,7 +60,8 @@ namespace Microsoft.AspNet.Builder
             return UseStatusCodePages(app, context =>
             {
                 var body = string.Format(CultureInfo.InvariantCulture, bodyFormat, context.HttpContext.Response.StatusCode);
-                return context.HttpContext.Response.SendAsync(body, contentType);
+                context.HttpContext.Response.ContentType = contentType;
+                return context.HttpContext.Response.WriteAsync(body);
             });
         }
 
diff --git a/src/Microsoft.AspNet.Diagnostics/StatusCodePagesOptions.cs b/src/Microsoft.AspNet.Diagnostics/StatusCodePagesOptions.cs
index 242ab5b96d..ebe5bd4241 100644
--- a/src/Microsoft.AspNet.Diagnostics/StatusCodePagesOptions.cs
+++ b/src/Microsoft.AspNet.Diagnostics/StatusCodePagesOptions.cs
@@ -23,7 +23,8 @@ namespace Microsoft.AspNet.Diagnostics
                 var statusCode = context.HttpContext.Response.StatusCode;
                 var body = string.Format(CultureInfo.InvariantCulture, "Status Code: {0}; {1}",
                     statusCode, ReasonPhrases.GetReasonPhrase(statusCode)) + new string(' ', 500);
-                return context.HttpContext.Response.SendAsync(body, "text/plain");
+                context.HttpContext.Response.ContentType = "text/plain";
+                return context.HttpContext.Response.WriteAsync(body);
             };
         }