diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index af7c8370279..ee3188646c6 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -359,15 +359,8 @@ static bool command_common(uint8_t code) {
         // jump to bootloader
         case MAGIC_KC(MAGIC_KEY_BOOTLOADER):
         case MAGIC_KC(MAGIC_KEY_BOOTLOADER_ALT):
-            clear_keyboard();  // clear to prevent stuck keys
             print("\n\nJumping to bootloader... ");
-#ifdef AUDIO_ENABLE
-            stop_all_notes();
-            shutdown_user();
-#else
-            wait_ms(1000);
-#endif
-            bootloader_jump();  // not return
+            reset_keyboard();
             break;
 
         // debug toggle