diff --git a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFParser.java b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFParser.java
index 9b38c5cff57..259b63ed8ee 100644
--- a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFParser.java
+++ b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFParser.java
@@ -310,7 +310,8 @@ abstract class RTFParser extends AbstractFilter
         if (binaryBytesLeft > 0) {
           binaryBuf.write(ch);
           binaryBytesLeft--;
-        } else {
+        }
+        if (binaryBytesLeft == 0) {
           state = S_text;
           specialsTable = savedSpecials;
           savedSpecials = null;