diff --git a/Cargo.toml b/Cargo.toml
index 616c761..c83508d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ pulse = ["dep:libpulse-sys"]
 ndk = { version = "0.9.0", default-features = false, features = ["audio", "api-level-27"] }
 
 [target.'cfg(target_os = "windows")'.dependencies]
-winapi = { version = "0.3.9", features = ["minwindef", "winnt", "windef", "winuser", "dsound", "synchapi", "winbase"] }
+winapi = { version = "0.3.9", features = ["minwindef", "winnt", "windef", "winuser", "dsound", "synchapi", "winbase", "handleapi"] }
 
 [target.'cfg(all(target_os = "unknown", target_arch = "wasm32"))'.dependencies]
 js-sys = "0.3.61"
diff --git a/src/directsound.rs b/src/directsound.rs
index f36c7c9..838b7ad 100644
--- a/src/directsound.rs
+++ b/src/directsound.rs
@@ -26,6 +26,7 @@ use winapi::{
     },
     um::{
         dsound::*,
+        handleapi::CloseHandle,
         synchapi::{CreateEventA, WaitForMultipleObjects},
         unknwnbase::{IUnknown, IUnknownVtbl},
         winbase::{INFINITE, WAIT_OBJECT_0},
@@ -64,6 +65,7 @@ type DeviceSample = i16;
 
 pub struct DirectSoundDevice {
     direct_sound: *mut IDirectSound,
+    notify: *mut IDirectSoundNotify,
     data_sender_thread_handle: Option<JoinHandle<()>>,
     is_running: Arc<AtomicBool>,
 }
@@ -229,6 +231,7 @@ impl AudioOutputDevice for DirectSoundDevice {
 
             Ok(Self {
                 direct_sound,
+                notify,
                 data_sender_thread_handle,
                 is_running,
             })
@@ -251,6 +254,7 @@ impl Drop for DirectSoundDevice {
 
             // Ensure that the ref counter is zero to the device is actually destroyed.
             assert_eq!((*self.direct_sound).Release(), 0);
+            assert_eq!((*self.notify).Release(), 0);
         }
     }
 }
@@ -297,6 +301,12 @@ where
                 _ => panic!("Unknown buffer point!"),
             }
         }
+
+        check((*self.buffer).Stop(), "Failed to stop buffer").unwrap();
+        assert_eq!((*self.buffer).Release(), 0);
+        for handle in self.notify_points {
+            assert_ne!(CloseHandle(handle), 0);
+        }
     }
 
     unsafe fn write(&self, offset_bytes: DWORD, len_bytes: DWORD, data_buffer: &[f32]) {