diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index 74bfc0626..66e7e1002 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -947,7 +947,9 @@ void unregister_code(uint8_t code) {
  */
 void tap_code_delay(uint8_t code, uint16_t delay) {
     register_code(code);
-    wait_ms(delay);
+    for (uint16_t i = delay; i > 0; i--) {
+        wait_ms(1);
+    }
     unregister_code(code);
 }