diff --git a/keyboard/hhkb_rn42/main.c b/keyboard/hhkb_rn42/main.c
index b0097dfe0d7..a2c217a2d30 100644
--- a/keyboard/hhkb_rn42/main.c
+++ b/keyboard/hhkb_rn42/main.c
@@ -121,7 +121,7 @@ int main(void)
         }
 
         /* Bluetooth mode when ready */
-        if (!force_usb) {
+        if (!config_mode && !force_usb) {
             if (rn42_ready() && host_get_driver() != &rn42_driver) {
                 clear_keyboard();
                 host_set_driver(&rn42_driver);