diff --git a/app/app.c b/app/app.c
index f24860d..23e93cb 100644
--- a/app/app.c
+++ b/app/app.c
@@ -1173,7 +1173,8 @@ void APP_TimeSlice10ms(void)
 				if (gAlarmState == ALARM_STATE_TXALARM) {
 					gAlarmState = ALARM_STATE_SITE_ALARM;
 
-					RADIO_SendCssTail();
+					if(gEeprom.TAIL_TONE_ELIMINATION)
+						RADIO_SendCssTail();
 					BK4819_SetupPowerAmplifier(0, 0);
 					BK4819_ToggleGpioOut(BK4819_GPIO1_PIN29_PA_ENABLE, false);
 					BK4819_Enable_AfDac_DiscMode_TxDsp();
diff --git a/radio.c b/radio.c
index 914bddd..a7db68d 100644
--- a/radio.c
+++ b/radio.c
@@ -1025,7 +1025,8 @@ void RADIO_SendEndOfTransmission(void)
 	DTMF_SendEndOfTransmission();
 
 	// send the CTCSS/DCS tail tone - allows the receivers to mute the usual FM squelch tail/crash
-	RADIO_SendCssTail();
+	if(gEeprom.TAIL_TONE_ELIMINATION)
+		RADIO_SendCssTail();
 	RADIO_SetupRegisters(false);
 }
 
@@ -1035,6 +1036,7 @@ void RADIO_PrepareCssTX(void)
 
 	SYSTEM_DelayMs(200);
 
-	RADIO_SendCssTail();
+	if(gEeprom.TAIL_TONE_ELIMINATION)
+		RADIO_SendCssTail();
 	RADIO_SetupRegisters(true);
 }