diff --git a/src/messages/Message.cpp b/src/messages/Message.cpp
index 912eeefec..b6708aca2 100644
--- a/src/messages/Message.cpp
+++ b/src/messages/Message.cpp
@@ -35,7 +35,8 @@ SBHighlight Message::getScrollBarHighlight() const
         return SBHighlight(
             ColorProvider::instance().color(ColorType::Subscription));
     }
-    else if (this->flags.has(MessageFlag::RedeemedHighlight))
+    else if (this->flags.has(MessageFlag::RedeemedHighlight) ||
+             this->flags.has(MessageFlag::RedeemedChannelPointReward))
     {
         return SBHighlight(
             ColorProvider::instance().color(ColorType::RedeemedHighlight),
diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp
index 0e7547ffa..76f4d1e36 100644
--- a/src/messages/layouts/MessageLayout.cpp
+++ b/src/messages/layouts/MessageLayout.cpp
@@ -221,7 +221,9 @@ void MessageLayout::paint(QPainter &painter, int width, int y, int messageIndex,
     }
 
     if (!isMentions &&
-        this->message_->flags.has(MessageFlag::RedeemedChannelPointReward))
+        (this->message_->flags.has(MessageFlag::RedeemedChannelPointReward) ||
+         this->message_->flags.has(MessageFlag::RedeemedHighlight)) &&
+        getSettings()->enableRedeemedHighlight.getValue())
     {
         painter.fillRect(
             0, y, this->scale_ * 4, pixmap->height(),
@@ -305,7 +307,9 @@ void MessageLayout::updateBuffer(QPixmap *buffer, int /*messageIndex*/,
             backgroundColor,
             *ColorProvider::instance().color(ColorType::Subscription));
     }
-    else if (this->message_->flags.has(MessageFlag::RedeemedHighlight) &&
+    else if ((this->message_->flags.has(MessageFlag::RedeemedHighlight) ||
+              this->message_->flags.has(
+                  MessageFlag::RedeemedChannelPointReward)) &&
              settings->enableRedeemedHighlight.getValue())
     {
         // Blend highlight color with usual background color