diff --git a/keyboards/zsa/moonlander/matrix.c b/keyboards/zsa/moonlander/matrix.c
index 26bb34ae65..f963170041 100644
--- a/keyboards/zsa/moonlander/matrix.c
+++ b/keyboards/zsa/moonlander/matrix.c
@@ -105,6 +105,10 @@ 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);
+                }
 #endif
             }
         }
diff --git a/keyboards/zsa/voyager/matrix.c b/keyboards/zsa/voyager/matrix.c
index b05313a033..c08c9e07bc 100644
--- a/keyboards/zsa/voyager/matrix.c
+++ b/keyboards/zsa/voyager/matrix.c
@@ -92,6 +92,10 @@ 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);
+                }
 #endif
             }
         }
diff --git a/quantum/pointing_device/pointing_device_auto_mouse.c b/quantum/pointing_device/pointing_device_auto_mouse.c
index 3cfb0ed464..c1f4c9f668 100644
--- a/quantum/pointing_device/pointing_device_auto_mouse.c
+++ b/quantum/pointing_device/pointing_device_auto_mouse.c
@@ -320,9 +320,6 @@ void auto_mouse_reset_trigger(bool pressed) {
 #ifdef LAYER_LOCK_ENABLE
         if(is_layer_locked(AUTO_MOUSE_DEFAULT_LAYER)) return;
 #endif
-        if (layer_state_is((AUTO_MOUSE_TARGET_LAYER))) {
-            layer_off((AUTO_MOUSE_TARGET_LAYER));
-        };
         auto_mouse_reset();
     }
     auto_mouse_context.timer.delay = timer_read();