diff --git a/keyboards/zsa/moonlander/matrix.c b/keyboards/zsa/moonlander/matrix.c
index f963170041..4543c1946e 100644
--- a/keyboards/zsa/moonlander/matrix.c
+++ b/keyboards/zsa/moonlander/matrix.c
@@ -105,9 +105,8 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
                 mcp23018_errors     = mcp23018_init_local(false);
 #ifdef RGB_MATRIX_ENABLE
                 rgb_matrix_init();
-                // Required to recover the solid color mode
-                if (rgb_matrix_get_mode() == 1) {
-                    rgb_matrix_set_color_all(255, 255, 255);
+                if (rgb_matrix_get_mode() == 1 && keyboard_config.rgb_matrix_enable) {
+                    rgb_matrix_set_color_all(0, 0, 0);
                 }
 #endif
             }