diff --git a/Makefile b/Makefile
index 01dcb83..f249d24 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ ENABLE_AUDIO_BAR              := 1
 ENABLE_COPY_CHAN_TO_VFO       := 1
 ENABLE_SPECTRUM               := 1
 ENABLE_REDUCE_LOW_MID_TX_POWER:= 0
+ENABLE_BYP_RAW_DEMODULATORS   := 0
 
 #############################################################
 
@@ -320,6 +321,9 @@ endif
 ifeq ($(ENABLE_REDUCE_LOW_MID_TX_POWER),1)
 	CFLAGS  += -DENABLE_REDUCE_LOW_MID_TX_POWER
 endif
+ifeq ($(ENABLE_BYP_RAW_DEMODULATORS),1)
+	CFLAGS  += -DENABLE_BYP_RAW_DEMODULATORS
+endif
 
 LDFLAGS =
 ifeq ($(ENABLE_CLANG),0)
diff --git a/radio.c b/radio.c
index 350a69b..7e623c0 100644
--- a/radio.c
+++ b/radio.c
@@ -49,8 +49,11 @@ const char gModulationStr[][4] =
 	"FM",
 	"AM",
 	"USB",
+	
+#ifdef ENABLE_BYP_RAW_DEMODULATORS
 	"BYP",
 	"RAW"
+#endif
 };
 
 bool RADIO_CheckValidChannel(uint16_t Channel, bool bCheckScanList, uint8_t VFO)
@@ -929,12 +932,15 @@ void RADIO_SetModulation(ModulationMode_t modulation)
 		case MODULATION_USB:
 			mod = BK4819_AF_BASEBAND2;
 			break;
+
+#ifdef ENABLE_BYP_RAW_DEMODULATORS
 		case MODULATION_BYP:
 			mod = BK4819_AF_UNKNOWN3;
 			break;
 		case MODULATION_RAW:
 			mod = BK4819_AF_BASEBAND1;
 			break;
+#endif
 	}
 
 	BK4819_SetAF(mod);
diff --git a/radio.h b/radio.h
index 5513cf9..f803e0b 100644
--- a/radio.h
+++ b/radio.h
@@ -65,12 +65,16 @@ typedef enum {
 	MODULATION_FM,
 	MODULATION_AM,
 	MODULATION_USB,
+
+#ifdef ENABLE_BYP_RAW_DEMODULATORS
 	MODULATION_BYP,
 	MODULATION_RAW,
+#endif
+
 	MODULATION_UKNOWN
 } ModulationMode_t;
 
-extern const char gModulationStr[5][4];
+extern const char gModulationStr[MODULATION_UKNOWN][4];
 
 typedef struct
 {