diff --git a/firmware/baseband/baseband_thread.cpp b/firmware/baseband/baseband_thread.cpp
index 6fc8a153..27d4b033 100644
--- a/firmware/baseband/baseband_thread.cpp
+++ b/firmware/baseband/baseband_thread.cpp
@@ -58,11 +58,9 @@ BasebandThread::BasebandThread(const tprio_t priority) {
 }
 
 BasebandThread::~BasebandThread() {
-	if( thread ) {
-		chThdTerminate(thread);
-		chThdWait(thread);
-		thread = nullptr;
-	}
+	chThdTerminate(thread);
+	chThdWait(thread);
+	thread = nullptr;
 }
 
 void BasebandThread::set_configuration(const BasebandConfiguration& new_configuration) {
diff --git a/firmware/baseband/rssi_thread.cpp b/firmware/baseband/rssi_thread.cpp
index 465e1d1f..81be13ec 100644
--- a/firmware/baseband/rssi_thread.cpp
+++ b/firmware/baseband/rssi_thread.cpp
@@ -40,11 +40,9 @@ RSSIThread::RSSIThread(const tprio_t priority) {
 }
 
 RSSIThread::~RSSIThread() {
-	if( thread ) {
-		chThdTerminate(thread);
-		chThdWait(thread);
-		thread = nullptr;
-	}
+	chThdTerminate(thread);
+	chThdWait(thread);
+	thread = nullptr;
 }
 
 void RSSIThread::run() {