diff --git a/src/compression_engine/gzip.rs b/src/compression_engine/gzip.rs
index cbb1f97..c931b58 100644
--- a/src/compression_engine/gzip.rs
+++ b/src/compression_engine/gzip.rs
@@ -75,4 +75,22 @@ impl<W: Write> AutoFinishGzEncoder<W> {
 }
 
 #[cfg(feature = "gzip")]
-impl<W: Write> Drop for AutoFinishGz
\ No newline at end of file
+impl<W: Write> Drop for AutoFinishGzEncoder<W> {
+    fn drop(&mut self) {
+        if let Some(encoder) = self.encoder.take() {
+            debug!("COMPRESSION: Finishing");
+            let _ = encoder.finish();
+        }
+    }
+}
+
+#[cfg(feature = "gzip")]
+impl<W: Write> Write for AutoFinishGzEncoder<W> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.encoder.as_mut().unwrap().write(buf)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.encoder.as_mut().unwrap().flush()
+    }
+}