diff --git a/lib/utils/interrupt_char.c b/lib/utils/interrupt_char.c
index 3810f7a965..7014ae6a8f 100644
--- a/lib/utils/interrupt_char.c
+++ b/lib/utils/interrupt_char.c
@@ -32,9 +32,6 @@
 int mp_interrupt_char = -1;
 
 void mp_hal_set_interrupt_char(int c) {
-    if (c != -1) {
-        mp_obj_exception_clear_traceback(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
-    }
     mp_interrupt_char = c;
 }
 
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index 49d8976e61..ebd9dcb5b0 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -39,9 +39,6 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
 }
 
 void mp_hal_set_interrupt_char(int c) {
-    if (c != -1) {
-        mp_obj_exception_clear_traceback(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
-    }
     tud_cdc_set_wanted_char(c);
 }
 
diff --git a/py/scheduler.c b/py/scheduler.c
index ca91e42da6..eccd9f91b5 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -29,7 +29,9 @@
 #include "py/runtime.h"
 
 #if MICROPY_KBD_EXCEPTION
+// This function may be called asynchronously at any time so only do the bare minimum.
 void MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(mp_keyboard_interrupt)(void) {
+    MP_STATE_VM(mp_kbd_exception).traceback_data = NULL;
     MP_STATE_VM(mp_pending_exception) = MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception));
     #if MICROPY_ENABLE_SCHEDULER
     if (MP_STATE_VM(sched_state) == MP_SCHED_IDLE) {