diff --git a/firmware/baseband/baseband_thread.cpp b/firmware/baseband/baseband_thread.cpp
index f654bda73..606d09254 100644
--- a/firmware/baseband/baseband_thread.cpp
+++ b/firmware/baseband/baseband_thread.cpp
@@ -42,8 +42,10 @@
 
 #include <array>
 
+WORKING_AREA(baseband_thread_wa, 2048);
+
 Thread* BasebandThread::start(const tprio_t priority) {
-	return chThdCreateStatic(wa, sizeof(wa),
+	return chThdCreateStatic(baseband_thread_wa, sizeof(baseband_thread_wa),
 		priority, ThreadBase::fn,
 		this
 	);
diff --git a/firmware/baseband/baseband_thread.hpp b/firmware/baseband/baseband_thread.hpp
index f21d53ee9..e19882346 100644
--- a/firmware/baseband/baseband_thread.hpp
+++ b/firmware/baseband/baseband_thread.hpp
@@ -50,8 +50,6 @@ public:
 	BasebandProcessor* baseband_processor { nullptr };
 
 private:
-	WORKING_AREA(wa, 2048);
-
 	BasebandConfiguration baseband_configuration;
 
 	void run() override;
diff --git a/firmware/baseband/main.cpp b/firmware/baseband/main.cpp
index cb0cb3656..6705f8af7 100755
--- a/firmware/baseband/main.cpp
+++ b/firmware/baseband/main.cpp
@@ -74,9 +74,6 @@ void __late_init(void) {
 
 }
 
-static BasebandThread baseband_thread;
-static RSSIThread rssi_thread;
-
 static void init() {
 	i2s::i2s0::configure(
 		audio::i2s0_config_tx,
@@ -163,6 +160,8 @@ public:
 
 private:
 	MessageHandlerMap message_map;
+	BasebandThread baseband_thread;
+	RSSIThread rssi_thread;
 
 	bool is_running = true;
 
diff --git a/firmware/baseband/rssi_thread.cpp b/firmware/baseband/rssi_thread.cpp
index d7b5f99ca..0bf153342 100644
--- a/firmware/baseband/rssi_thread.cpp
+++ b/firmware/baseband/rssi_thread.cpp
@@ -28,8 +28,10 @@
 #include "message.hpp"
 #include "portapack_shared_memory.hpp"
 
+WORKING_AREA(rssi_thread_wa, 128);
+
 Thread* RSSIThread::start(const tprio_t priority) {
-	return chThdCreateStatic(wa, sizeof(wa),
+	return chThdCreateStatic(rssi_thread_wa, sizeof(rssi_thread_wa),
 		priority, ThreadBase::fn,
 		this
 	);
diff --git a/firmware/baseband/rssi_thread.hpp b/firmware/baseband/rssi_thread.hpp
index f3fde10ae..0a00ef8e9 100644
--- a/firmware/baseband/rssi_thread.hpp
+++ b/firmware/baseband/rssi_thread.hpp
@@ -38,8 +38,6 @@ public:
 	Thread* start(const tprio_t priority);
 
 private:
-	WORKING_AREA(wa, 128);
-
 	void run() override;
 
 	const uint32_t sampling_rate { 400000 };