diff --git a/quantum/quantum.c b/quantum/quantum.c
index e7dc71e5d7..0fe54c60a7 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -238,6 +238,14 @@ bool process_record_quantum(keyrecord_t *record) {
     }
 #endif
 
+#ifdef TAP_DANCE_ENABLE
+    if (preprocess_tap_dance(keycode, record)) {
+        // The tap dance might have updated the layer state, therefore the
+        // result of the keycode lookup might change.
+        keycode = get_record_keycode(record, true);
+    }
+#endif
+
 #ifdef VELOCIKEY_ENABLE
     if (velocikey_enabled() && record->event.pressed) {
         velocikey_accelerate();
@@ -250,14 +258,6 @@ bool process_record_quantum(keyrecord_t *record) {
     }
 #endif
 
-#ifdef TAP_DANCE_ENABLE
-    if (preprocess_tap_dance(keycode, record)) {
-        // The tap dance might have updated the layer state, therefore the
-        // result of the keycode lookup might change.
-        keycode = get_record_keycode(record, true);
-    }
-#endif
-
     if (!(
 #if defined(KEY_LOCK_ENABLE)
             // Must run first to be able to mask key_up events.