diff --git a/src/main/msp/msp.c b/src/main/msp/msp.c
index 60293759ed..089243bc91 100644
--- a/src/main/msp/msp.c
+++ b/src/main/msp/msp.c
@@ -268,7 +268,7 @@ static void mspRebootFn(serialPort_t *serialPort)
 #endif
     default:
 
-        break;
+        return;
     }
 
     // control should never return here.
@@ -1547,7 +1547,7 @@ static mspResult_e mspFcProcessOutCommandWithArg(uint8_t cmdMSP, sbuf_t *src, sb
 
             if (rebootMode >= MSP_REBOOT_COUNT
 #if !defined(USE_USB_MSC)
-                || rebootMode == MSP_REBOOT_MSC
+                || rebootMode == MSP_REBOOT_MSC || rebootMode == MSP_REBOOT_MSC_UTC
 #endif
                 ) {
                 return MSP_RESULT_ERROR;
diff --git a/src/main/target/common_post.h b/src/main/target/common_post.h
index 6ccaa90915..038227d5b0 100644
--- a/src/main/target/common_post.h
+++ b/src/main/target/common_post.h
@@ -151,12 +151,13 @@
 #undef USE_ADC_INTERNAL
 #endif
 
-#if (!defined(USE_SDCARD) && !defined(USE_FLASHFS)) || !(defined(STM32F4) || defined(STM32F7))
+#if (!defined(USE_SDCARD) && !defined(USE_FLASHFS)) || !defined(USE_BLACKBOX)
 #undef USE_USB_MSC
 #endif
 
 #if !defined(USE_VCP)
 #undef USE_USB_CDC_HID
+#undef USE_USB_MSC
 #endif
 
 #if defined(USE_USB_CDC_HID) || defined(USE_USB_MSC)
@@ -226,10 +227,6 @@
 #endif
 #endif
 
-#ifndef USE_BLACKBOX
-#undef USE_USB_MSC
-#endif
-
 #if (!defined(USE_FLASHFS) || !defined(USE_RTC_TIME) || !defined(USE_USB_MSC))
 #undef USE_PERSISTENT_MSC_RTC
 #endif