diff --git a/impl/src/main/java/com/sun/faces/renderkit/html_basic/HtmlResponseWriter.java b/impl/src/main/java/com/sun/faces/renderkit/html_basic/HtmlResponseWriter.java
index ca144674be..0fa7bb20c8 100644
--- a/impl/src/main/java/com/sun/faces/renderkit/html_basic/HtmlResponseWriter.java
+++ b/impl/src/main/java/com/sun/faces/renderkit/html_basic/HtmlResponseWriter.java
@@ -500,7 +500,8 @@ else if (null != cdataStartSlashStar.reset() && cdataStartSlashStar.find()
         } else if (!withinStyle || isStyle) {
             isStyle = false;
         }
-        if (!withinScript && !withinScript) {
+        // always turn escaping back on once an element ends
+        if (!withinScript && !withinStyle) {
             dontEscape = false;
         }