diff --git a/keyboards/novelkeys/nk_classic_tkl/keymaps/default/keymap.c b/keyboards/novelkeys/nk_classic_tkl/keymaps/default/keymap.c
index a99350ef7f..a0ea79c45f 100644
--- a/keyboards/novelkeys/nk_classic_tkl/keymaps/default/keymap.c
+++ b/keyboards/novelkeys/nk_classic_tkl/keymaps/default/keymap.c
@@ -43,6 +43,10 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
         for (uint8_t i = 50; i <= 55; i++) {
             rgb_matrix_set_color(i, 255, 86, 0);
         }
+    } else if ((rgb_matrix_get_mode() == RGB_MATRIX_TYPING_HEATMAP) || (rgb_matrix_get_mode() == RGB_MATRIX_DIGITAL_RAIN)) {
+        for (uint8_t i = 50; i <= 55; i++) {
+            rgb_matrix_set_color(i, 0, 0, 0);
+        }
     }
     return false;
 }
diff --git a/keyboards/novelkeys/nk_classic_tkl_iso/keymaps/default/keymap.c b/keyboards/novelkeys/nk_classic_tkl_iso/keymaps/default/keymap.c
index 5af062e0b0..8939cde8a4 100644
--- a/keyboards/novelkeys/nk_classic_tkl_iso/keymaps/default/keymap.c
+++ b/keyboards/novelkeys/nk_classic_tkl_iso/keymaps/default/keymap.c
@@ -43,6 +43,10 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
         for (uint8_t i = 50; i <= 55; i++) {
             rgb_matrix_set_color(i, 255, 86, 0);
         }
+    } else if ((rgb_matrix_get_mode() == RGB_MATRIX_TYPING_HEATMAP) || (rgb_matrix_get_mode() == RGB_MATRIX_DIGITAL_RAIN)) {
+        for (uint8_t i = 50; i <= 55; i++) {
+            rgb_matrix_set_color(i, 0, 0, 0);
+        }
     }
     return false;
 }