diff --git a/lib/libarchive/archive_read_support_compression_gzip.c b/lib/libarchive/archive_read_support_compression_gzip.c
index 1e8f818dc099..4669ea4443bf 100644
--- a/lib/libarchive/archive_read_support_compression_gzip.c
+++ b/lib/libarchive/archive_read_support_compression_gzip.c
@@ -428,8 +428,9 @@ gzip_source_read(struct archive_read_source *self, const void **p)
 						"Failed to clean up gzip decompressor");
 					return (ARCHIVE_FATAL);
 				}
-				/* Restart header parser with the next block. */
-				state->header_state = state->header_done = 0;
+				/* zlib has been torn down */
+				state->header_done = 0;
+				state->eof = 1;
 				/* FALL THROUGH */
 			case Z_OK: /* Decompressor made some progress. */
 				/* If we filled our buffer, update stats and return. */