diff --git a/src/main/io/usb_cdc_hid.c b/src/main/io/usb_cdc_hid.c
index f569694af5..8661c6f7b2 100644
--- a/src/main/io/usb_cdc_hid.c
+++ b/src/main/io/usb_cdc_hid.c
@@ -39,7 +39,7 @@
 #if defined(STM32F4)
 #include "vcpf4/usbd_cdc_vcp.h"
 #include "usbd_hid_core.h"
-#elif defined(STM32F7) || defined(STM32H7)
+#elif defined(STM32F7) || defined(STM32H7) || defined(STM32G4)
 #include "drivers/serial_usb_vcp.h"
 #include "usbd_hid.h"
 #include "vcp_hal/usbd_cdc_interface.h"
@@ -96,7 +96,7 @@ void sendRcDataToHid(void)
     }
 #if defined(STM32F4)
     USBD_HID_SendReport(&USB_OTG_dev, (uint8_t*)report, sizeof(report));
-#elif defined(STM32F7) || defined(STM32H7)
+#elif defined(STM32F7) || defined(STM32H7) || defined(STM32G4)
     USBD_HID_SendReport(&USBD_Device, (uint8_t*)report, sizeof(report));
 #else
 # error "MCU does not support USB HID."
diff --git a/src/main/vcp_hal/usbd_conf.h b/src/main/vcp_hal/usbd_conf.h
index 483d98b7a6..a934992e28 100644
--- a/src/main/vcp_hal/usbd_conf.h
+++ b/src/main/vcp_hal/usbd_conf.h
@@ -61,6 +61,10 @@
 #error Unknown MCU
 #endif
 
+#ifdef STM32G4
+#define USB_OTG_MAX_EP0_SIZE USB_MAX_EP0_SIZE
+#endif
+
 #if (USBD_DEBUG_LEVEL > 0)
 #include <stdio.h>
 #endif