diff --git a/radio.c b/radio.c
index c4c0c9f..a4c45f8 100644
--- a/radio.c
+++ b/radio.c
@@ -1054,6 +1054,7 @@ void RADIO_PrepareTX(void)
 	){
 		// TX frequency not allowed
 		State = VFO_STATE_TX_DISABLE;
+		gVfoConfigureMode = VFO_CONFIGURE;
 	} else if (SerialConfigInProgress()) {
 		// TX is disabled or config upload/download in progress
 		State = VFO_STATE_TX_DISABLE;
diff --git a/ui/main.c b/ui/main.c
index 7166f10..c5b84f9 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -777,7 +777,8 @@ void UI_DisplayMain(void)
 		else
 		{	// receiving .. show the RX symbol
 			mode = VFO_MODE_RX;
-			if (FUNCTION_IsRx() && gEeprom.RX_VFO == vfo_num) {
+			//if (FUNCTION_IsRx() && gEeprom.RX_VFO == vfo_num) {
+			if (FUNCTION_IsRx() && gEeprom.RX_VFO == vfo_num && VfoState[vfo_num] == VFO_STATE_NORMAL) {
 #ifdef ENABLE_FEAT_F4HWN
 				RxBlinkLed = 1;
 				RxBlinkLedCounter = 0;