diff --git a/mz_strm_bzip.c b/mz_strm_bzip.c
index 085dd64..f645d60 100644
--- a/mz_strm_bzip.c
+++ b/mz_strm_bzip.c
@@ -149,6 +149,8 @@ int32_t mz_stream_bzip_read(void *stream, void *buf, int32_t size)
 
             if (read < 0)
                 return read;
+            if (read == 0 && out_bytes == 0)
+                break;
 
             bzip->bzstream.next_in = (char *)bzip->buffer;
             bzip->bzstream.avail_in = (uint32_t)read;
@@ -184,7 +186,7 @@ int32_t mz_stream_bzip_read(void *stream, void *buf, int32_t size)
             break;
         }
     }
-    while (bzip->bzstream.avail_out > 0 && out_bytes > 0);
+    while (bzip->bzstream.avail_out > 0);
 
     if (bzip->error != 0)
         return MZ_DATA_ERROR;
diff --git a/mz_strm_libcomp.c b/mz_strm_libcomp.c
index 600e4a5..98f9de6 100644
--- a/mz_strm_libcomp.c
+++ b/mz_strm_libcomp.c
@@ -142,6 +142,8 @@ int32_t mz_stream_libcomp_read(void *stream, void *buf, int32_t size)
 
             if (read < 0)
                 return read;
+            if (read == 0 && out_bytes == 0)
+                break;
 
             libcomp->cstream.src_ptr = libcomp->buffer;
             libcomp->cstream.src_size = (size_t)read;
@@ -177,7 +179,7 @@ int32_t mz_stream_libcomp_read(void *stream, void *buf, int32_t size)
             break;
         }
     }
-    while (libcomp->cstream.dst_size > 0 && out_bytes > 0);
+    while (libcomp->cstream.dst_size > 0);
 
     if (libcomp->error != 0)
         return MZ_DATA_ERROR;
diff --git a/mz_strm_lzma.c b/mz_strm_lzma.c
index 4e70832..8134a47 100644
--- a/mz_strm_lzma.c
+++ b/mz_strm_lzma.c
@@ -175,6 +175,8 @@ int32_t mz_stream_lzma_read(void *stream, void *buf, int32_t size)
 
             if (read < 0)
                 return read;
+            if (read == 0 && out_bytes == 0)
+                break;
 
             lzma->lstream.next_in = lzma->buffer;
             lzma->lstream.avail_in = (size_t)read;
@@ -207,7 +209,7 @@ int32_t mz_stream_lzma_read(void *stream, void *buf, int32_t size)
             break;
         }
     }
-    while (lzma->lstream.avail_out > 0 && out_bytes > 0);
+    while (lzma->lstream.avail_out > 0);
 
     if (lzma->error != 0)
         return MZ_DATA_ERROR;
diff --git a/mz_strm_zlib.c b/mz_strm_zlib.c
index 5ef85a3..c29e0cf 100644
--- a/mz_strm_zlib.c
+++ b/mz_strm_zlib.c
@@ -154,6 +154,8 @@ int32_t mz_stream_zlib_read(void *stream, void *buf, int32_t size)
 
             if (read < 0)
                 return read;
+            if (read == 0 && out_bytes == 0)
+                break;
 
             zlib->zstream.next_in = zlib->buffer;
             zlib->zstream.avail_in = read;
@@ -189,7 +191,7 @@ int32_t mz_stream_zlib_read(void *stream, void *buf, int32_t size)
             break;
         }
     }
-    while (zlib->zstream.avail_out > 0 && out_bytes > 0);
+    while (zlib->zstream.avail_out > 0);
 
     if (zlib->error != 0)
     {