diff --git a/symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs b/symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs
index 7bb9c6f15..45e9981c9 100644
--- a/symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs
+++ b/symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs
@@ -75,7 +75,7 @@ public void Write (MethodDebugInformation info)
 
 		void DefineCustomMetadata (MethodDebugInformation info, MetadataToken import_parent)
 		{
-			var metadata = new CustomMetadataWriter (this.writer);
+			using var metadata = new CustomMetadataWriter (this.writer);
 
 			if (import_parent.RID != 0) {
 				metadata.WriteForwardInfo (import_parent);
@@ -367,6 +367,7 @@ public void WriteCustomMetadata ()
 		public void Dispose ()
 		{
 			stream.Dispose ();
+			writer.Dispose ();
 		}
 	}
 }