diff --git a/src/core/stream.js b/src/core/stream.js
index 61f1af544..6e25b36c2 100644
--- a/src/core/stream.js
+++ b/src/core/stream.js
@@ -508,12 +508,18 @@ var FlateStream = (function FlateStreamClosure() {
       var buffer = this.ensureBuffer(bufferLength + blockLen);
       var end = bufferLength + blockLen;
       this.bufferLength = end;
-      for (var n = bufferLength; n < end; ++n) {
-        if (typeof (b = bytes[bytesPos++]) == 'undefined') {
+      if (blockLen === 0) {
+        if (typeof bytes[bytesPos] == 'undefined') {
           this.eof = true;
-          break;
         }
-        buffer[n] = b;
+      } else {
+        for (var n = bufferLength; n < end; ++n) {
+          if (typeof (b = bytes[bytesPos++]) == 'undefined') {
+            this.eof = true;
+            break;
+          }
+          buffer[n] = b;
+        }
       }
       this.bytesPos = bytesPos;
       return;