1 files changed, 4 insertions, 2 deletions

diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 5c548de05..076f18664 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -33,9 +33,11 @@ bool waitForUsb(void) {
         wait_ms(100);
     }
 
-#if defined(__AVR__)
     // Avoid NO_USB_STARTUP_CHECK - Disable USB as the previous checks seem to enable it somehow
+#if defined(__AVR__)
     (USBCON &= ~(_BV(USBE) | _BV(OTGPADE)));
+#else
+    usbStop(&USBD1);
 #endif
 
     return false;
@@ -76,7 +78,7 @@ __attribute__((weak)) bool is_keyboard_master(void) {
 }
 
 static void keyboard_master_setup(void) {
-#if defined(USE_I2C) || defined(EH)
+#if defined(USE_I2C)
 #    ifdef SSD1306OLED
     matrix_master_OLED_init();
 #    endif