diff --git a/firmware/baseband/audio_output.cpp b/firmware/baseband/audio_output.cpp
index f23f8871..6e29fa16 100644
--- a/firmware/baseband/audio_output.cpp
+++ b/firmware/baseband/audio_output.cpp
@@ -98,5 +98,3 @@ void AudioOutput::feed_audio_stats(const buffer_f32_t& audio) {
 		}
 	);
 }
-
-AudioOutput audio_output;
diff --git a/firmware/baseband/audio_output.hpp b/firmware/baseband/audio_output.hpp
index 85ab438e..df490d3c 100644
--- a/firmware/baseband/audio_output.hpp
+++ b/firmware/baseband/audio_output.hpp
@@ -55,6 +55,4 @@ private:
 	void feed_audio_stats(const buffer_f32_t& audio);
 };
 
-extern AudioOutput audio_output;
-
 #endif/*__AUDIO_OUTPUT_H__*/
diff --git a/firmware/baseband/proc_am_audio.hpp b/firmware/baseband/proc_am_audio.hpp
index 1471263d..5da5136d 100644
--- a/firmware/baseband/proc_am_audio.hpp
+++ b/firmware/baseband/proc_am_audio.hpp
@@ -27,6 +27,7 @@
 #include "dsp_decimate.hpp"
 #include "dsp_demodulate.hpp"
 
+#include "audio_output.hpp"
 #include "spectrum_collector.hpp"
 
 #include <cstdint>
@@ -56,6 +57,8 @@ private:
 
 	dsp::demodulate::AM demod;
 
+	AudioOutput audio_output;
+
 	SpectrumCollector channel_spectrum;
 
 	bool configured { false };
diff --git a/firmware/baseband/proc_nfm_audio.hpp b/firmware/baseband/proc_nfm_audio.hpp
index 14c2033c..69ce6ee0 100644
--- a/firmware/baseband/proc_nfm_audio.hpp
+++ b/firmware/baseband/proc_nfm_audio.hpp
@@ -27,6 +27,7 @@
 #include "dsp_decimate.hpp"
 #include "dsp_demodulate.hpp"
 
+#include "audio_output.hpp"
 #include "spectrum_collector.hpp"
 
 class NarrowbandFMAudio : public BasebandProcessor {
@@ -55,6 +56,8 @@ private:
 
 	dsp::demodulate::FM demod;
 
+	AudioOutput audio_output;
+
 	SpectrumCollector channel_spectrum;
 
 	bool configured { false };
diff --git a/firmware/baseband/proc_wfm_audio.hpp b/firmware/baseband/proc_wfm_audio.hpp
index 22282189..5c30c2e9 100644
--- a/firmware/baseband/proc_wfm_audio.hpp
+++ b/firmware/baseband/proc_wfm_audio.hpp
@@ -27,6 +27,7 @@
 #include "dsp_decimate.hpp"
 #include "dsp_demodulate.hpp"
 
+#include "audio_output.hpp"
 #include "spectrum_collector.hpp"
 
 class WidebandFMAudio : public BasebandProcessor {
@@ -56,6 +57,8 @@ private:
 	dsp::decimate::DecimateBy2CIC4Real audio_dec_2;
 	dsp::decimate::FIR64AndDecimateBy2Real audio_filter;
 
+	AudioOutput audio_output;
+
 	SpectrumCollector channel_spectrum;
 	size_t spectrum_interval_samples = 0;
 	size_t spectrum_samples = 0;