diff --git a/app/app.c b/app/app.c
index 9c7da71..e1d65e4 100644
--- a/app/app.c
+++ b/app/app.c
@@ -1134,11 +1134,11 @@ void APP_Update(void)
 		{	// dual watch mode, go back to sleep
 
 			// sample the RSSI
+			gCurrentRSSI = (int16_t)BK4819_GetRSSI();
 			#ifdef ENABLE_AM_FIX
 				// with compensation
-				gCurrentRSSI = (int16_t)BK4819_GetRSSI() - (rssi_db_gain_diff * 2);
-			#else
-				gCurrentRSSI = (int16_t)BK4819_GetRSSI();
+				if (gSetting_AM_fix)
+					gCurrentRSSI -= rssi_db_gain_diff * 2;
 			#endif
 
 			UI_UpdateRSSI(gCurrentRSSI);
@@ -1660,11 +1660,11 @@ void APP_TimeSlice500ms(void)
 
 		if (gCurrentFunction != FUNCTION_POWER_SAVE)
 		{
+			gCurrentRSSI = (int16_t)BK4819_GetRSSI();
 			#ifdef ENABLE_AM_FIX
 				// with compensation
-				gCurrentRSSI = (int16_t)BK4819_GetRSSI() - (rssi_db_gain_diff * 2);
-			#else
-				gCurrentRSSI = (int16_t)BK4819_GetRSSI();
+				if (gSetting_AM_fix)
+					gCurrentRSSI -= rssi_db_gain_diff * 2;
 			#endif
 
 			UI_UpdateRSSI(gCurrentRSSI);
diff --git a/ui/main.c b/ui/main.c
index 5897069..2f769cb 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -497,7 +497,7 @@ void UI_DisplayMain(void)
 	{	// we're free to use the middle empty line for something
 
 		#if defined(ENABLE_AM_FIX) && defined(ENABLE_AM_FIX_SHOW_DATA)
-			if (gEeprom.VfoInfo[gEeprom.RX_CHANNEL].IsAM)
+			if (gSetting_AM_fix && gEeprom.VfoInfo[gEeprom.RX_CHANNEL].IsAM)
 			{
 				switch (gCurrentFunction)
 				{
@@ -514,7 +514,9 @@ void UI_DisplayMain(void)
 						break;
 				}
 			}
-		#else
+			else
+		#endif
+		{
 			#ifdef ENABLE_AUDIO_BAR
 				UI_DisplayAudioBar();
 			
@@ -536,7 +538,7 @@ void UI_DisplayMain(void)
 					#endif
 				}
 			}
-		#endif
+		}
 	}
 
 	ST7565_BlitFullScreen();