diff --git a/src/fe_utils/astreamer_lz4.c b/src/fe_utils/astreamer_lz4.c
index a5865c93598..e196fcc81e5 100644
--- a/src/fe_utils/astreamer_lz4.c
+++ b/src/fe_utils/astreamer_lz4.c
@@ -360,11 +360,14 @@ astreamer_lz4_decompressor_content(astreamer *streamer,
 		avail_in -= read_size;
 		next_in += read_size;
 
+		/* Update output buffer based on number of bytes produced */
+		avail_out -= out_size;
+		next_out += out_size;
 		mystreamer->bytes_written += out_size;
 
 		/*
 		 * If output buffer is full then forward the content to next streamer
-		 * and update the output buffer.
+		 * and reset the output buffer.
 		 */
 		if (mystreamer->bytes_written >= mystreamer->base.bbs_buffer.maxlen)
 		{
@@ -374,13 +377,8 @@ astreamer_lz4_decompressor_content(astreamer *streamer,
 							  context);
 
 			avail_out = mystreamer->base.bbs_buffer.maxlen;
-			mystreamer->bytes_written = 0;
 			next_out = (uint8 *) mystreamer->base.bbs_buffer.data;
-		}
-		else
-		{
-			avail_out = mystreamer->base.bbs_buffer.maxlen - mystreamer->bytes_written;
-			next_out += mystreamer->bytes_written;
+			mystreamer->bytes_written = 0;
 		}
 	}
 }