diff --git a/app/Kconfig b/app/Kconfig
index b586f7fc..02c0205e 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -330,7 +330,7 @@ config ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE
 
 config ZMK_RGB_UNDERGLOW_AUTO_OFF_USB
 	bool "Turn off RGB underglow when USB is disconnected"
-	depends on USB
+	depends on USB_DEVICE_STACK
 
 #ZMK_RGB_UNDERGLOW
 endif
diff --git a/app/src/rgb_underglow.c b/app/src/rgb_underglow.c
index 60fcbadc..6b9b477e 100644
--- a/app/src/rgb_underglow.c
+++ b/app/src/rgb_underglow.c
@@ -271,6 +271,11 @@ static int zmk_rgb_underglow_init(const struct device *_arg) {
     settings_load_subtree("rgb/underglow");
 #endif
 
+#if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_USB)
+    if(!zmk_usb_is_powered())
+        state.on = false;
+#endif
+
     k_timer_start(&underglow_tick, K_NO_WAIT, K_MSEC(50));
 
     return 0;