diff --git a/plugins/Kaleidoscope-DynamicTapDance/src/kaleidoscope/plugin/DynamicTapDance.cpp b/plugins/Kaleidoscope-DynamicTapDance/src/kaleidoscope/plugin/DynamicTapDance.cpp
index ef2702e1..27ecd3c9 100644
--- a/plugins/Kaleidoscope-DynamicTapDance/src/kaleidoscope/plugin/DynamicTapDance.cpp
+++ b/plugins/Kaleidoscope-DynamicTapDance/src/kaleidoscope/plugin/DynamicTapDance.cpp
@@ -19,6 +19,8 @@
 
 #include <Kaleidoscope-EEPROM-Settings.h>
 #include "Kaleidoscope-FocusSerial.h"
+#include "kaleidoscope/Runtime.h"
+#include "kaleidoscope/KeyEvent.h"
 
 namespace kaleidoscope {
 namespace plugin {
@@ -72,14 +74,14 @@ bool DynamicTapDance::dance(uint8_t tap_dance_index, KeyAddr key_addr,
     break;
   case TapDance::Interrupt:
   case TapDance::Timeout:
-    handleKeyswitchEvent(key, key_addr, IS_PRESSED | INJECTED);
+    Runtime.handleKeyEvent(KeyEvent(key_addr, IS_PRESSED, key));
     break;
   case TapDance::Hold:
-    handleKeyswitchEvent(key, key_addr, IS_PRESSED | WAS_PRESSED | INJECTED);
+    Runtime.handleKeyEvent(KeyEvent(key_addr, IS_PRESSED | WAS_PRESSED, key));
     break;
   case TapDance::Release:
-    kaleidoscope::Runtime.hid().keyboard().sendReport();
-    handleKeyswitchEvent(key, key_addr, WAS_PRESSED | INJECTED);
+    //kaleidoscope::Runtime.hid().keyboard().sendReport();
+    Runtime.handleKeyEvent(KeyEvent(key_addr, WAS_PRESSED, key));
     break;
   }