diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ConfluenceWikiGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ConfluenceWikiGenerator.java
index 747dcdfd76..972721bcfa 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ConfluenceWikiGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ConfluenceWikiGenerator.java
@@ -92,4 +92,16 @@ public class ConfluenceWikiGenerator extends DefaultCodegen implements CodegenCo
         }
         return objs;
     }
+
+    @Override
+    public String escapeQuotationMark(String input) {
+        // just return the original string
+        return input;
+    }
+
+    @Override
+    public String escapeUnsafeCharacters(String input) {
+        // just return the original string
+        return input;
+    }
 }
diff --git a/modules/swagger-codegen/src/main/resources/confluenceWikiDocs/index.mustache b/modules/swagger-codegen/src/main/resources/confluenceWikiDocs/index.mustache
index 0a90ab4c54..28312bb4b7 100644
--- a/modules/swagger-codegen/src/main/resources/confluenceWikiDocs/index.mustache
+++ b/modules/swagger-codegen/src/main/resources/confluenceWikiDocs/index.mustache
@@ -32,12 +32,12 @@ h2. Endpoints
         {{/bodyParams}}
     {{/hasBodyParam}}
 
-    {{#hasHeaderParam}}
+    {{#hasHeaderParams}}
         h5. Header Parameters
         ||Name||Description||Required||Default||Pattern||
         {{#headerParam}}{{>param}}
         {{/headerParam}}
-    {{/hasHeaderParam}}
+    {{/hasHeaderParams}}
 
     {{#hasQueryParams}}
         h5. Query Parameters
@@ -91,4 +91,4 @@ h2. Models
         {{#vars}} |{{name}} |{{#isNotRequired}}(x){{/isNotRequired}} |{{datatype}} |{{description}} |
         {{/vars}}
     {{/model}}
-{{/models}}
\ No newline at end of file
+{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
index 466df75c41..d3c2681bce 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache
@@ -80,12 +80,12 @@
     </div>  <!-- field-items -->
     {{/hasBodyParam}}
 
-    {{#hasHeaderParam}}
+    {{#hasHeaderParams}}
     <h3 class="field-label">Request headers</h3>
     <div class="field-items">
       {{#headerParam}}{{>headerParam}}{{/headerParam}}
     </div>  <!-- field-items -->
-    {{/hasHeaderParam}}
+    {{/hasHeaderParams}}
 
     {{#hasQueryParams}}
     <h3 class="field-label">Query parameters</h3>
diff --git a/samples/documentation/cwiki/confluence-markup.txt b/samples/documentation/cwiki/confluence-markup.txt
index dcbba6877a..83996a97de 100644
--- a/samples/documentation/cwiki/confluence-markup.txt
+++ b/samples/documentation/cwiki/confluence-markup.txt
@@ -60,7 +60,9 @@ h2. Endpoints
         |petId |Pet id to delete |(/) | |  |
 
 
-
+        h5. Header Parameters
+        ||Name||Description||Required||Default||Pattern||
+        
 
 
 
diff --git a/samples/html/index.html b/samples/html/index.html
index d83d25c03a..425b46386d 100644
--- a/samples/html/index.html
+++ b/samples/html/index.html
@@ -288,6 +288,10 @@ font-style: italic;
 
 
 
+    <h3 class="field-label">Request headers</h3>
+    <div class="field-items">
+      
+    </div>  <!-- field-items -->