diff --git a/src/com/google/enterprise/adaptor/fs/FsAdaptor.java b/src/com/google/enterprise/adaptor/fs/FsAdaptor.java
index 224e902..d4c3099 100644
--- a/src/com/google/enterprise/adaptor/fs/FsAdaptor.java
+++ b/src/com/google/enterprise/adaptor/fs/FsAdaptor.java
@@ -510,9 +510,9 @@
 
   private HtmlResponseWriter createHtmlResponseWriter(Response response)
       throws IOException {
+    response.setContentType("text/html; charset=" + CHARSET.name());
     Writer writer = new OutputStreamWriter(response.getOutputStream(),
         CHARSET);
-    response.setContentType("text/html; charset=" + CHARSET.name());
     // TODO(ejona): Get locale from request.
     return new HtmlResponseWriter(writer, context.getDocIdEncoder(),
         Locale.ENGLISH);