diff --git a/src/main/interface/msp.c b/src/main/interface/msp.c
index 3fcb68d06..489154e68 100644
--- a/src/main/interface/msp.c
+++ b/src/main/interface/msp.c
@@ -105,6 +105,7 @@
 #include "pg/pg_ids.h"
 #include "pg/rx.h"
 #include "pg/rx_spi.h"
+#include "pg/usb.h"
 #include "pg/vcd.h"
 
 #include "rx/rx.h"
@@ -1123,6 +1124,11 @@ static bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst)
         sbufWriteU8(dst, 0);
         sbufWriteU8(dst, 0);
 #endif
+#if defined(USE_USB_CDC_HID)
+        sbufWriteU8(dst, usbDevConfig()->type);
+#else
+        sbufWriteU8(dst, 0);
+#endif
 
         break;
     case MSP_FAILSAFE_CONFIG:
@@ -2103,6 +2109,11 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
             sbufReadU8(src);
             sbufReadU8(src);
             sbufReadU8(src);
+#endif
+#if defined(USE_USB_CDC_HID)
+            usbDevConfigMutable()->type = sbufReadU8(src);
+#else
+            sbufReadU8(src);
 #endif
         }