diff --git a/common/common-io/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java
index b63063f6..0a4f0fce 100644
--- a/common/common-io/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java
+++ b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java
@@ -116,9 +116,7 @@ public final class EncoderStream extends FilterOutputStream {
         }
         else {
             // Encode data already in the buffer
-            if (bufferPos != 0) {
-                encodeBuffer();
-            }
+            encodeBuffer();
 
             // Encode rest without buffering
             encoder.encode(out, pBytes, pOffset, pLength);