diff --git a/src/kaleidoscope/driver/hid/base/Keyboard.h b/src/kaleidoscope/driver/hid/base/Keyboard.h
index 8b2557ab..fad80cac 100644
--- a/src/kaleidoscope/driver/hid/base/Keyboard.h
+++ b/src/kaleidoscope/driver/hid/base/Keyboard.h
@@ -193,8 +193,12 @@ class Keyboard {
   }
   void releaseAllKeys() __attribute__((noinline)) {
     resetModifierTracking();
-    nkro_keyboard_.releaseAll();
-    consumer_control_.releaseAll();
+    if (boot_keyboard_.getProtocol() == HID_BOOT_PROTOCOL) {
+      boot_keyboard_.releaseAll();
+    } else {
+      nkro_keyboard_.releaseAll();
+      consumer_control_.releaseAll();
+    }
   }
   void pressConsumerControl(Key mapped_key) {
     consumer_control_.press(CONSUMER(mapped_key));