diff --git a/quantum/quantum.c b/quantum/quantum.c
index 21f499165a..833f53175f 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -93,9 +93,12 @@ __attribute__((weak)) void unregister_code16(uint16_t code) {
 
 __attribute__((weak)) void tap_code16(uint16_t code) {
     register_code16(code);
-#if TAP_CODE_DELAY > 0
-    wait_ms(TAP_CODE_DELAY);
-#endif
+    if (code == KC_CAPS_LOCK) {
+        wait_ms(TAP_HOLD_CAPS_DELAY);
+    }
+    else if (TAP_CODE_DELAY > 0) {
+        wait_ms(TAP_CODE_DELAY); 
+    }
     unregister_code16(code);
 }