diff --git a/quantum/rgb_matrix/animations/raindrops_anim.h b/quantum/rgb_matrix/animations/raindrops_anim.h
index c8cc12ef165c..92bf78420c29 100644
--- a/quantum/rgb_matrix/animations/raindrops_anim.h
+++ b/quantum/rgb_matrix/animations/raindrops_anim.h
@@ -2,7 +2,9 @@
 RGB_MATRIX_EFFECT(RAINDROPS)
 #    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static rgb_t raindrops_set_color(hsv_t hsv) {
+static void raindrops_set_color(uint8_t i) {
+    hsv_t hsv = rgb_matrix_config.hsv;
+
     // Take the shortest path between hues
     int16_t deltaH = ((hsv.h + 180) % 360 - hsv.h) / 4;
     if (deltaH > 127) {
@@ -11,30 +13,29 @@ static rgb_t raindrops_set_color(hsv_t hsv) {
         deltaH += 256;
     }
 
-    hsv.h += (deltaH * random8_max(3));
-    return rgb_matrix_hsv_to_rgb(hsv);
+    hsv.h    += (deltaH * random8_max(3));
+    rgb_t rgb = rgb_matrix_hsv_to_rgb(hsv);
+    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
 }
 
 bool RAINDROPS(effect_params_t* params) {
-    static uint16_t idx = 0;
-    static rgb_t    rgb = {0};
+    static uint8_t idx = UINT8_MAX;
 
-    if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
+    if ((params->iter == 0) && (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0)) {
         idx = random8_max(RGB_MATRIX_LED_COUNT);
-        rgb = raindrops_set_color(rgb_matrix_config.hsv);
     }
 
     RGB_MATRIX_USE_LIMITS(led_min, led_max);
     if (params->init) {
         for (uint8_t i = led_min; i < led_max; i++) {
             RGB_MATRIX_TEST_LED_FLAGS();
-            rgb = raindrops_set_color(rgb_matrix_config.hsv);
-            rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+            raindrops_set_color(i);
         }
     }
     // Change one LED every tick
     else if (led_min <= idx && idx <= led_max && HAS_ANY_FLAGS(g_led_config.flags[idx], params->flags)) {
-        rgb_matrix_set_color(idx, rgb.r, rgb.g, rgb.b);
+        raindrops_set_color(idx);
+        idx = UINT8_MAX;
     }
     return rgb_matrix_check_finished_leds(led_max);
 }