diff --git a/df_datalink_sp/src/networking/phy_layer/phy_antenna.c b/df_datalink_sp/src/networking/phy_layer/phy_antenna.c
index 91fea8b..d8fd703 100644
--- a/df_datalink_sp/src/networking/phy_layer/phy_antenna.c
+++ b/df_datalink_sp/src/networking/phy_layer/phy_antenna.c
@@ -245,7 +245,7 @@ void Phy_AntConfigInit(PHY_ANT_CONFIG *antConfig)
 void Phy_AntConfigMode(PHY_INST *instPtr, PHY_ANT_MODE mode) 
 {
 	ASSERT(instPtr != NULL);
-	uint8_t config = instPtr->antConfig.antMode & (~ANT_MODE_BEAM_MASK);
+	uint8_t config = instPtr->antConfig.antMode & ANT_MODE_BEAM_MASK;
 	switch (mode)
 	{
 	case PHY_ANT_MODE_SILENT:
@@ -259,8 +259,9 @@ void Phy_AntConfigMode(PHY_INST *instPtr, PHY_ANT_MODE mode)
 		break;
 	default:
 		DBG_ERROR("Unknown antenna mode: %" PRIu8 ", remain previous mode.\n", mode);
-		break;
+		return;
 	}
+	instPtr->antConfig.antMode = config;
 }
 
 int32_t Phy_SetBeamNo(PHY_INST *instPtr, int32_t beamNo)