diff --git a/platforms/chibios/suspend.c b/platforms/chibios/suspend.c
index a937ccf059..4b9b79f9d4 100644
--- a/platforms/chibios/suspend.c
+++ b/platforms/chibios/suspend.c
@@ -22,7 +22,7 @@ void suspend_power_down(void) {
     // on AVR, this enables the watchdog for 15ms (max), and goes to
     // SLEEP_MODE_PWR_DOWN
 
-    wait_ms(17);
+    wait_ms(5);
 }
 
 /** \brief suspend wakeup condition
diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c
index 1eebdaf6c3..fc73da48f0 100644
--- a/tmk_core/protocol/chibios/chibios.c
+++ b/tmk_core/protocol/chibios/chibios.c
@@ -190,6 +190,7 @@ void protocol_pre_task(void) {
                  * the bus and get our keyboard out of suspension. */
                 usbWakeupHost(&USB_DRIVER);
             }
+            usb_event_queue_task();
         }
         /* after a successful wakeup a USB_EVENT_WAKEUP is signaled to QMK by
          * ChibiOS, which triggers a wakeup callback that restores the state of