diff --git a/src/SharpCompress/Archives/AbstractWritableArchive.Async.cs b/src/SharpCompress/Archives/AbstractWritableArchive.Async.cs
index a8012896..67b8dffc 100644
--- a/src/SharpCompress/Archives/AbstractWritableArchive.Async.cs
+++ b/src/SharpCompress/Archives/AbstractWritableArchive.Async.cs
@@ -122,6 +122,14 @@ public abstract partial class AbstractWritableArchive<TEntry, TVolume, TOptions>
             .ConfigureAwait(false);
     }
 
+    public override async ValueTask DisposeAsync()
+    {
+        await base.DisposeAsync().ConfigureAwait(false);
+        newEntries.Cast<Entry>().ForEach(x => x.Close());
+        removedEntries.Cast<Entry>().ForEach(x => x.Close());
+        modifiedEntries.Cast<Entry>().ForEach(x => x.Close());
+    }
+
     protected abstract ValueTask SaveToAsync(
         Stream stream,
         TOptions options,
diff --git a/tests/SharpCompress.Test/GZip/GZipArchiveAsyncTests.cs b/tests/SharpCompress.Test/GZip/GZipArchiveAsyncTests.cs
index e8ce2a9d..d7812b57 100644
--- a/tests/SharpCompress.Test/GZip/GZipArchiveAsyncTests.cs
+++ b/tests/SharpCompress.Test/GZip/GZipArchiveAsyncTests.cs
@@ -221,4 +221,23 @@ public class GZipArchiveAsyncTests : ArchiveTests
             Path.Combine(scratchPath2, "Tar.tar")
         );
     }
+
+    [Fact]
+    public async ValueTask GZip_Async_Dispose_Closes_New_Entry_Stream()
+    {
+        var entryStream = new TestStream(new MemoryStream(new byte[] { 1, 2, 3 }));
+
+        await using (var archive = await GZipArchive.CreateAsyncArchive())
+        {
+            await archive.AddEntryAsync(
+                "test.bin",
+                entryStream,
+                closeStream: true,
+                size: entryStream.Length
+            );
+            await archive.SaveToAsync(new MemoryStream(), new GZipWriterOptions());
+        }
+
+        Assert.True(entryStream.IsDisposed);
+    }
 }
diff --git a/tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs b/tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs
index 684f05c2..1324212f 100644
--- a/tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs
+++ b/tests/SharpCompress.Test/Tar/TarArchiveAsyncTests.cs
@@ -179,6 +179,28 @@ public class TarArchiveAsyncTests : ArchiveTests
         CompareArchivesByPath(unmodified, scratchPath);
     }
 
+    [Fact]
+    public async ValueTask Tar_Async_Dispose_Closes_New_Entry_Stream()
+    {
+        var entryStream = new TestStream(new MemoryStream(Encoding.UTF8.GetBytes("test")));
+
+        await using (var archive = await TarArchive.CreateAsyncArchive())
+        {
+            await archive.AddEntryAsync(
+                "test.txt",
+                entryStream,
+                closeStream: true,
+                size: entryStream.Length
+            );
+            await archive.SaveToAsync(
+                new MemoryStream(),
+                new TarWriterOptions(CompressionType.None, true)
+            );
+        }
+
+        Assert.True(entryStream.IsDisposed);
+    }
+
     [Fact]
     public async ValueTask Tar_Random_Write_Add_Async()
     {
diff --git a/tests/SharpCompress.Test/Zip/ZipArchiveAsyncTests.cs b/tests/SharpCompress.Test/Zip/ZipArchiveAsyncTests.cs
index 86b97c05..420ce481 100644
--- a/tests/SharpCompress.Test/Zip/ZipArchiveAsyncTests.cs
+++ b/tests/SharpCompress.Test/Zip/ZipArchiveAsyncTests.cs
@@ -186,6 +186,28 @@ public class ZipArchiveAsyncTests : ArchiveTests
         CompareArchivesByPath(unmodified, scratchPath);
     }
 
+    [Fact]
+    public async ValueTask Zip_Async_Dispose_Closes_New_Entry_Stream()
+    {
+        var entryStream = new TestStream(new MemoryStream(Encoding.UTF8.GetBytes("test")));
+
+        await using (var archive = await ZipArchive.CreateAsyncArchive())
+        {
+            await archive.AddEntryAsync(
+                "test.txt",
+                entryStream,
+                closeStream: true,
+                size: entryStream.Length
+            );
+            await archive.SaveToAsync(
+                new MemoryStream(),
+                new ZipWriterOptions(CompressionType.Deflate)
+            );
+        }
+
+        Assert.True(entryStream.IsDisposed);
+    }
+
     [Fact]
     public async ValueTask Zip_Deflate_Entry_Stream_Async()
     {