diff --git a/guacamole-common-js/src/main/webapp/modules/Parser.js b/guacamole-common-js/src/main/webapp/modules/Parser.js
index 8cd93f2ca..aa3dbe5ee 100644
--- a/guacamole-common-js/src/main/webapp/modules/Parser.js
+++ b/guacamole-common-js/src/main/webapp/modules/Parser.js
@@ -208,7 +208,7 @@ Guacamole.Parser = function Parser() {
                     // Immediately truncate buffer if its contents have been
                     // completely parsed, so that the next call to receive()
                     // need not append to the buffer unnecessarily
-                    if (elementEnd + 1 === buffer.length) {
+                    if (!isBuffer && elementEnd + 1 === buffer.length) {
                         elementEnd = -1;
                         buffer = '';
                     }