diff --git a/keyboards/clueboard/config.h b/keyboards/clueboard/config.h
index 38170627774..ad683238564 100644
--- a/keyboards/clueboard/config.h
+++ b/keyboards/clueboard/config.h
@@ -42,16 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
 )
 
-/* How long a "key tap" is. Used in functions like LT() and macros to determine
- * how long QMK "holds down" a tapped key.
- *
- * If you are macOS this should be at least 500ms to avoid macOS's accidental
- * Caps Lock activation prevention measures, as noted by /u/JerryEn here:
- *
- * https://www.reddit.com/r/clueboard/comments/6bfc2m/lt_not_working_with_caps_lock/dhmbp88/
- */
-#define TAPPING_TERM 600 // ms
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index 8640dfab359..a534f818ec0 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -26,6 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action_macro.h"
 #include "action_util.h"
 #include "action.h"
+#include "wait.h"
 
 #ifdef DEBUG_ACTION
 #include "debug.h"
@@ -438,6 +439,9 @@ void process_action(keyrecord_t *record, action_t action)
                     } else {
                         if (tap_count > 0) {
                             dprint("KEYMAP_TAP_KEY: Tap: unregister_code\n");
+                            if (action.layer_tap.code == KC_CAPS) {
+                                wait_ms(80);
+                            }
                             unregister_code(action.layer_tap.code);
                         } else {
                             dprint("KEYMAP_TAP_KEY: No tap: Off on release\n");