diff --git a/firmware/baseband/baseband_thread.hpp b/firmware/baseband/baseband_thread.hpp
index 81d35433a..6da3c4939 100644
--- a/firmware/baseband/baseband_thread.hpp
+++ b/firmware/baseband/baseband_thread.hpp
@@ -30,11 +30,6 @@
 
 class BasebandThread : public ThreadBase {
 public:
-	BasebandThread(
-	) : ThreadBase { "baseband" }
-	{
-	}
-
 	Thread* start(const tprio_t priority);
 
 	void on_message(const Message* const message);
diff --git a/firmware/baseband/chconf.h b/firmware/baseband/chconf.h
index 8045cf4f0..0ad245292 100755
--- a/firmware/baseband/chconf.h
+++ b/firmware/baseband/chconf.h
@@ -129,7 +129,7 @@
  * @note    The default is @p TRUE.
  */
 #if !defined(CH_USE_REGISTRY) || defined(__DOXYGEN__)
-#define CH_USE_REGISTRY                 TRUE
+#define CH_USE_REGISTRY                 FALSE
 #endif
 
 /**
diff --git a/firmware/baseband/rssi_thread.hpp b/firmware/baseband/rssi_thread.hpp
index 0a00ef8e9..5233ddd59 100644
--- a/firmware/baseband/rssi_thread.hpp
+++ b/firmware/baseband/rssi_thread.hpp
@@ -30,11 +30,6 @@
 
 class RSSIThread : public ThreadBase {
 public:
-	RSSIThread(
-	) : ThreadBase { "rssi" }
-	{
-	}
-
 	Thread* start(const tprio_t priority);
 
 private:
diff --git a/firmware/baseband/thread_base.hpp b/firmware/baseband/thread_base.hpp
index b318b240f..921aeeb99 100644
--- a/firmware/baseband/thread_base.hpp
+++ b/firmware/baseband/thread_base.hpp
@@ -26,26 +26,17 @@
 
 class ThreadBase {
 public:
-	constexpr ThreadBase(
-		const char* const name
-	) : name { name }
-	{
-	}
-
 	virtual ~ThreadBase() = default;
 	
 protected:
 	static msg_t fn(void* arg) {
 		auto obj = static_cast<ThreadBase*>(arg);
-		chRegSetThreadName(obj->name);
 		obj->run();
 
 		return 0;
 	}
 
 private:
-	const char* const name;
-
 	virtual void run() = 0;
 };