diff --git a/impl/src/main/java/com/sun/faces/application/view/FaceletViewHandlingStrategy.java b/impl/src/main/java/com/sun/faces/application/view/FaceletViewHandlingStrategy.java
index 5d24cd0556..4c2a109215 100644
--- a/impl/src/main/java/com/sun/faces/application/view/FaceletViewHandlingStrategy.java
+++ b/impl/src/main/java/com/sun/faces/application/view/FaceletViewHandlingStrategy.java
@@ -887,7 +887,11 @@ protected ResponseWriter createResponseWriter(FacesContext context) throws IOExc
 
         // set the buffer for content, -1 indicates nothing should be set.
         if (responseBufferSize != -1) {
-            extContext.setResponseBufferSize(responseBufferSize);
+            if (!extContext.isResponseCommitted()) {
+                extContext.setResponseBufferSize(responseBufferSize);
+            } else {
+                LOGGER.warning("Skipping attempt to set buffer size on a committed response");
+            }
         }
 
         // get our content type