diff --git a/firmware/baseband/baseband_thread.hpp b/firmware/baseband/baseband_thread.hpp
index 8bb4894a..f21d53ee 100644
--- a/firmware/baseband/baseband_thread.hpp
+++ b/firmware/baseband/baseband_thread.hpp
@@ -48,11 +48,12 @@ public:
 	Thread* thread_main { nullptr };
 	Thread* thread_rssi { nullptr };
 	BasebandProcessor* baseband_processor { nullptr };
-	BasebandConfiguration baseband_configuration;
 
 private:
 	WORKING_AREA(wa, 2048);
 
+	BasebandConfiguration baseband_configuration;
+
 	void run() override;
 
 	BasebandProcessor* create_processor(const int32_t mode);
diff --git a/firmware/baseband/rssi_thread.hpp b/firmware/baseband/rssi_thread.hpp
index d7224ddb..f3fde10a 100644
--- a/firmware/baseband/rssi_thread.hpp
+++ b/firmware/baseband/rssi_thread.hpp
@@ -37,12 +37,12 @@ public:
 
 	Thread* start(const tprio_t priority);
 
-	uint32_t sampling_rate { 400000 };
-
 private:
 	WORKING_AREA(wa, 128);
 
 	void run() override;
+
+	const uint32_t sampling_rate { 400000 };
 };
 
 #endif/*__RSSI_THREAD_H__*/