diff --git a/openrtx/src/protocols/M17/M17Demodulator.cpp b/openrtx/src/protocols/M17/M17Demodulator.cpp
index e4086017..72b199ae 100644
--- a/openrtx/src/protocols/M17/M17Demodulator.cpp
+++ b/openrtx/src/protocols/M17/M17Demodulator.cpp
@@ -136,6 +136,9 @@ void M17Demodulator::init()
 
 void M17Demodulator::terminate()
 {
+    // Ensure proper termination of baseband sampling
+    inputStream_stop(basebandId);
+
     // Delete the buffers and deallocate memory.
     delete[] baseband_buffer;
     delete activeFrame;