diff --git a/app/menu.c b/app/menu.c
index ebd6107..dc700fd 100644
--- a/app/menu.c
+++ b/app/menu.c
@@ -225,8 +225,10 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax)
 			*pMax = ARRAY_SIZE(gSubMenu_RX_TX) - 1;
 			break;
 
-		#ifdef ENABLE_AM_FIX
-			case MENU_AM_FIX:
+		#ifndef ENABLE_FEAT_F4HWN
+			#ifdef ENABLE_AM_FIX
+				case MENU_AM_FIX:
+			#endif
 		#endif
 		#ifdef ENABLE_AUDIO_BAR
 			case MENU_MIC_BAR:
@@ -748,12 +750,14 @@ void MENU_AcceptSetting(void)
 			gRequestSaveChannel = 1;
 			return;
 
-		#ifdef ENABLE_AM_FIX
-			case MENU_AM_FIX:
-				gSetting_AM_fix = gSubMenuSelection;
-				gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
-				gFlagResetVfos    = true;
-				break;
+		#ifndef ENABLE_FEAT_F4HWN
+			#ifdef ENABLE_AM_FIX
+				case MENU_AM_FIX:
+					gSetting_AM_fix = gSubMenuSelection;
+					gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
+					gFlagResetVfos    = true;
+					break;
+			#endif
 		#endif
 
 		#ifdef ENABLE_NOAA
@@ -1177,11 +1181,14 @@ void MENU_ShowCurrentSetting(void)
 			gSubMenuSelection = gTxVfo->Modulation;
 			break;
 
-#ifdef ENABLE_AM_FIX
-		case MENU_AM_FIX:
-			gSubMenuSelection = gSetting_AM_fix;
-			break;
+#ifndef ENABLE_FEAT_F4HWN
+	#ifdef ENABLE_AM_FIX
+			case MENU_AM_FIX:
+				gSubMenuSelection = gSetting_AM_fix;
+				break;
+	#endif
 #endif
+				
 		#ifdef ENABLE_NOAA
 			case MENU_NOAA_S:
 				gSubMenuSelection = gEeprom.NOAA_AUTO_SCAN;
diff --git a/misc.c b/misc.c
index 0c2daf8..70c151a 100644
--- a/misc.c
+++ b/misc.c
@@ -101,7 +101,7 @@ bool              gSetting_ScrambleEnable;
 enum BacklightOnRxTx_t gSetting_backlight_on_tx_rx;
 
 #ifdef ENABLE_AM_FIX
-	bool          gSetting_AM_fix;
+	bool          gSetting_AM_fix = true;
 #endif
 
 #ifdef ENABLE_FEAT_F4HWN
diff --git a/settings.c b/settings.c
index d54bcbe..5c34e75 100644
--- a/settings.c
+++ b/settings.c
@@ -257,8 +257,10 @@ void SETTINGS_InitEEPROM(void)
 	#ifdef ENABLE_AUDIO_BAR
 		gSetting_mic_bar       = !!(Data[7] & (1u << 4));
 	#endif
-	#ifdef ENABLE_AM_FIX
-		gSetting_AM_fix        = !!(Data[7] & (1u << 5));
+	#ifndef ENABLE_FEAT_F4HWN
+		#ifdef ENABLE_AM_FIX
+			gSetting_AM_fix        = !!(Data[7] & (1u << 5));
+		#endif
 	#endif
 	gSetting_backlight_on_tx_rx = (Data[7] >> 6) & 3u;
 
@@ -646,8 +648,10 @@ void SETTINGS_SaveSettings(void)
 	#ifdef ENABLE_AUDIO_BAR
 		if (!gSetting_mic_bar)           State[7] &= ~(1u << 4);
 	#endif
-	#ifdef ENABLE_AM_FIX
-		if (!gSetting_AM_fix)            State[7] &= ~(1u << 5);
+	#ifndef ENABLE_FEAT_F4HWN
+		#ifdef ENABLE_AM_FIX
+			if (!gSetting_AM_fix)            State[7] &= ~(1u << 5);
+		#endif
 	#endif
 	State[7] = (State[7] & ~(3u << 6)) | ((gSetting_backlight_on_tx_rx & 3u) << 6);
 
diff --git a/ui/menu.c b/ui/menu.c
index 6793992..8a4bd0f 100644
--- a/ui/menu.c
+++ b/ui/menu.c
@@ -116,8 +116,10 @@ const t_menu_item MenuList[] =
 	{"D List",		MENU_D_LIST        },
 #endif
 	{"D Live",		MENU_D_LIVE_DEC    }, // live DTMF decoder
-#ifdef ENABLE_AM_FIX
-	{"AM Fix",		MENU_AM_FIX        },
+#ifndef ENABLE_FEAT_F4HWN
+	#ifdef ENABLE_AM_FIX
+		{"AM Fix",		MENU_AM_FIX        },
+	#endif
 #endif
 #ifdef ENABLE_VOX
 	{"VOX",			MENU_VOX           },
@@ -684,8 +686,10 @@ void UI_DisplayMenu(void)
 			strcpy(String, gSubMenu_RX_TX[gSubMenuSelection]);
 			break;
 
-		#ifdef ENABLE_AM_FIX
-			case MENU_AM_FIX:
+		#ifndef ENABLE_FEAT_F4HWN
+			#ifdef ENABLE_AM_FIX
+				case MENU_AM_FIX:
+			#endif
 		#endif
 		case MENU_BCL:
 		case MENU_BEEP: