1 files changed, 12 insertions, 2 deletions

diff --git a/keyboards/moonlander/matrix.c b/keyboards/moonlander/matrix.c
index df498bd6e..872643f61 100644
--- a/keyboards/moonlander/matrix.c
+++ b/keyboards/moonlander/matrix.c
@@ -272,8 +272,7 @@ void matrix_print(void) {
 // DO NOT REMOVE
 // Needed for proper wake/sleep
 void matrix_power_up(void) {
-    mcp23018_init();
-
+    bool temp_launching = is_launching;
     // outputs
     setPinOutput(B10);
     setPinOutput(B11);
@@ -291,6 +290,17 @@ void matrix_power_up(void) {
     setPinInputLow(A7);
     setPinInputLow(B0);
 
+    mcp23018_init();
+    is_launching = temp_launching;
+    if (!is_launching) {
+        ML_LED_1(false);
+        ML_LED_2(false);
+        ML_LED_3(false);
+        ML_LED_4(false);
+        ML_LED_5(false);
+        ML_LED_6(false);
+    }
+
     // initialize matrix state: all keys off
     for (uint8_t i=0; i < MATRIX_ROWS; i++) {
         matrix[i] = 0;