diff --git a/firmware/baseband/proc_ais.cpp b/firmware/baseband/proc_ais.cpp
index b12e8ba88..295bd8e15 100644
--- a/firmware/baseband/proc_ais.cpp
+++ b/firmware/baseband/proc_ais.cpp
@@ -23,9 +23,6 @@
 
 #include "portapack_shared_memory.hpp"
 
-#include "i2s.hpp"
-using namespace lpc43xx;
-
 #include "dsp_fir_taps.hpp"
 
 AISProcessor::AISProcessor() {
@@ -56,7 +53,7 @@ void AISProcessor::execute(const buffer_c8_t& buffer) {
 		}
 	}
 
-	i2s::i2s0::tx_mute();
+	mute_audio();
 }
 
 void AISProcessor::consume_symbol(
diff --git a/firmware/baseband/proc_ert.cpp b/firmware/baseband/proc_ert.cpp
index c2b08f476..5708e8ed5 100644
--- a/firmware/baseband/proc_ert.cpp
+++ b/firmware/baseband/proc_ert.cpp
@@ -23,9 +23,6 @@
 
 #include "portapack_shared_memory.hpp"
 
-#include "i2s.hpp"
-using namespace lpc43xx;
-
 float ERTProcessor::abs(const complex8_t& v) {
 	// const int16_t r = v.real() - offset_i;
 	// const int16_t i = v.imag() - offset_q;
@@ -83,7 +80,7 @@ void ERTProcessor::execute(const buffer_c8_t& buffer) {
 		clock_recovery(data);
 	}
 
-	i2s::i2s0::tx_mute();
+	mute_audio();
 }
 
 void ERTProcessor::consume_symbol(
diff --git a/firmware/baseband/proc_nfm_audio.cpp b/firmware/baseband/proc_nfm_audio.cpp
index 87217851b..749d754b1 100644
--- a/firmware/baseband/proc_nfm_audio.cpp
+++ b/firmware/baseband/proc_nfm_audio.cpp
@@ -48,14 +48,12 @@ void NarrowbandFMAudio::execute(const buffer_c8_t& buffer) {
 	static uint64_t audio_present_history = 0;
 	audio_present_history = (audio_present_history << 1) | (audio_present_now ? 1 : 0);
 	const bool audio_present = (audio_present_history != 0);
-	if( !audio_present ) {
-		// Zero audio buffer.
-		for(size_t i=0; i<audio.count; i++) {
-			audio.p[i] = 0;
-		}
+	
+	if( audio_present ) {
+		fill_audio_buffer(audio);
+	} else {
+		mute_audio();
 	}
-
-	fill_audio_buffer(audio);
 }
 
 void NarrowbandFMAudio::on_message(const Message* const message) {
diff --git a/firmware/baseband/proc_tpms.cpp b/firmware/baseband/proc_tpms.cpp
index 6ae7da998..5a3e96541 100644
--- a/firmware/baseband/proc_tpms.cpp
+++ b/firmware/baseband/proc_tpms.cpp
@@ -23,9 +23,6 @@
 
 #include "portapack_shared_memory.hpp"
 
-#include "i2s.hpp"
-using namespace lpc43xx;
-
 #include "dsp_fir_taps.hpp"
 
 // IFIR image-reject filter: fs=2457600, pass=100000, stop=407200, decim=4, fout=614400
@@ -77,7 +74,7 @@ void TPMSProcessor::execute(const buffer_c8_t& buffer) {
 		}
 	}
 
-	i2s::i2s0::tx_mute();
+	mute_audio();
 }
 
 void TPMSProcessor::consume_symbol(
diff --git a/firmware/baseband/proc_wideband_spectrum.cpp b/firmware/baseband/proc_wideband_spectrum.cpp
index 077342872..e8b624957 100644
--- a/firmware/baseband/proc_wideband_spectrum.cpp
+++ b/firmware/baseband/proc_wideband_spectrum.cpp
@@ -23,9 +23,6 @@
 
 #include "event_m4.hpp"
 
-#include "i2s.hpp"
-using namespace lpc43xx;
-
 #include "dsp_fft.hpp"
 
 #include <cstdint>
@@ -65,7 +62,7 @@ void WidebandSpectrum::execute(const buffer_c8_t& buffer) {
 		phase++;
 	}
 
-	i2s::i2s0::tx_mute();
+	mute_audio();
 }
 
 void WidebandSpectrum::on_message(const Message* const message) {