diff --git a/quantum/rgblight.c b/quantum/rgblight.c
index f933b931c1d..22bebcd1705 100644
--- a/quantum/rgblight.c
+++ b/quantum/rgblight.c
@@ -1059,7 +1059,7 @@ void rgblight_effect_knight(animation_status_t *anim) {
 
   if (high_bound <= 0 || low_bound >= RGBLIGHT_EFFECT_KNIGHT_LED_NUM - 1) {
     increment = -increment;
-    if (low_bound == 0 && increment == 1) {
+    if (increment == 1) {
         anim->pos = 0;
     }
   }
diff --git a/quantum/rgblight.h b/quantum/rgblight.h
index 23527386796..bd0d21e1d19 100644
--- a/quantum/rgblight.h
+++ b/quantum/rgblight.h
@@ -268,7 +268,7 @@ typedef struct _animation_status_t {
     union {
         uint16_t pos16;
         uint8_t  pos;
-        uint16_t current_hue;
+        int16_t  current_hue;
         uint16_t current_offset;
     };
 } animation_status_t;