diff --git a/openrtx/src/core/audio_codec.c b/openrtx/src/core/audio_codec.c
index 561c29fa..d7a1ff6b 100644
--- a/openrtx/src/core/audio_codec.c
+++ b/openrtx/src/core/audio_codec.c
@@ -123,6 +123,8 @@ bool codec_startDecode(const enum AudioSink destination)
 
 void codec_stop()
 {
+    if(running == false) return;
+
     running = false;
     pthread_join(codecThread, NULL);
 }
diff --git a/openrtx/src/protocols/M17/M17Demodulator.cpp b/openrtx/src/protocols/M17/M17Demodulator.cpp
index 35f106d6..6cf8beba 100644
--- a/openrtx/src/protocols/M17/M17Demodulator.cpp
+++ b/openrtx/src/protocols/M17/M17Demodulator.cpp
@@ -44,7 +44,8 @@ M17Demodulator::M17Demodulator()
 
 M17Demodulator::~M17Demodulator()
 {
-    terminate();
+    // TODO
+    // terminate();
 }
 
 void M17Demodulator::init()
diff --git a/openrtx/src/protocols/M17/M17Modulator.cpp b/openrtx/src/protocols/M17/M17Modulator.cpp
index 561b7112..db7c4433 100644
--- a/openrtx/src/protocols/M17/M17Modulator.cpp
+++ b/openrtx/src/protocols/M17/M17Modulator.cpp
@@ -39,7 +39,8 @@ M17Modulator::M17Modulator()
 
 M17Modulator::~M17Modulator()
 {
-    terminate();
+    // TODO
+    // terminate();
 }
 
 void M17Modulator::init()