diff --git a/sw_usb_audio/app_usb_aud_fosi_c1/src/extensions/audiohw.xc b/sw_usb_audio/app_usb_aud_fosi_c1/src/extensions/audiohw.xc
index db52ebe..df05a82 100644
--- a/sw_usb_audio/app_usb_aud_fosi_c1/src/extensions/audiohw.xc
+++ b/sw_usb_audio/app_usb_aud_fosi_c1/src/extensions/audiohw.xc
@@ -170,17 +170,16 @@ void switch_mode_by_c1_mode(unsigned c1_mode, unsigned force_reboot)
 #endif
         break;
     case 2:
-#if !BYPASS_UAC2
+#if !BR_UAC2
         SetRoleSwitchFlag(MODE_BR_UAC2);
         reboot_need = 1;
 #endif
         break;
     case 3:
-#if !BYPASS_UAC2
+#if !V71_UAC2
         SetRoleSwitchFlag(MODE_V71_UAC2);
         reboot_need = 1;
 #endif
-        reboot_need = 1;
         break;
     case 4:
 #if !FPS_UAC2
diff --git a/sw_usb_audio/app_usb_aud_fosi_c1_lp/src/extensions/audiohw.xc b/sw_usb_audio/app_usb_aud_fosi_c1_lp/src/extensions/audiohw.xc
index db52ebe..df05a82 100644
--- a/sw_usb_audio/app_usb_aud_fosi_c1_lp/src/extensions/audiohw.xc
+++ b/sw_usb_audio/app_usb_aud_fosi_c1_lp/src/extensions/audiohw.xc
@@ -170,17 +170,16 @@ void switch_mode_by_c1_mode(unsigned c1_mode, unsigned force_reboot)
 #endif
         break;
     case 2:
-#if !BYPASS_UAC2
+#if !BR_UAC2
         SetRoleSwitchFlag(MODE_BR_UAC2);
         reboot_need = 1;
 #endif
         break;
     case 3:
-#if !BYPASS_UAC2
+#if !V71_UAC2
         SetRoleSwitchFlag(MODE_V71_UAC2);
         reboot_need = 1;
 #endif
-        reboot_need = 1;
         break;
     case 4:
 #if !FPS_UAC2
diff --git a/sw_usb_audio/app_usb_aud_fosi_c1_v71/src/extensions/audiohw.xc b/sw_usb_audio/app_usb_aud_fosi_c1_v71/src/extensions/audiohw.xc
index 2d3e903..5125d2e 100644
--- a/sw_usb_audio/app_usb_aud_fosi_c1_v71/src/extensions/audiohw.xc
+++ b/sw_usb_audio/app_usb_aud_fosi_c1_v71/src/extensions/audiohw.xc
@@ -179,24 +179,34 @@ void switch_mode_by_c1_mode(unsigned c1_mode, unsigned force_reboot)
     switch (c1_mode)
     {
     case 1:
-        SetRoleSwitchFlag(MODE_FPS_UAC2);
-        reboot_need = 0;
+#if !BYPASS_UAC2
+        SetRoleSwitchFlag(MODE_BYPASS_UAC2);
+        reboot_need = 1;
+#endif
         break;
     case 2:
+#if !BR_UAC2
         SetRoleSwitchFlag(MODE_BR_UAC2);
         reboot_need = 1;
+#endif
         break;
     case 3:
+#if !V71_UAC2
         SetRoleSwitchFlag(MODE_V71_UAC2);
         reboot_need = 1;
+#endif
         break;
     case 4:
+#if !FPS_UAC2
         SetRoleSwitchFlag(MODE_FPS_UAC2);
         reboot_need = 1;
+#endif
         break;
     case 5:
+#if !FPS_UAC2
         SetRoleSwitchFlag(MODE_FPS_UAC2);
         reboot_need = 0;
+#endif
         break;
     }
 #else