diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
index 3ded53ba3..95e40733a 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
@@ -343,7 +343,10 @@ public class FreemarkerResult extends StrutsResultSupport {
                     contentType = "text/html";
                 }
 
-                String encoding = template.getEncoding();
+                String encoding = response.getCharacterEncoding();
+                if(encoding == null) {
+                    encoding = template.getEncoding();
+                }
 
                 if (encoding != null) {
                     contentType = contentType + "; charset=" + encoding;