diff --git a/quantum/quantum.c b/quantum/quantum.c
index f5e3b63f8..a64878c72 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -1084,6 +1084,9 @@ void matrix_init_quantum() {
   #ifdef HAPTIC_ENABLE
     haptic_init();
   #endif
+  #ifdef OUTPUT_AUTO_ENABLE
+    set_output(OUTPUT_AUTO);
+  #endif
   matrix_init_kb();
 }