diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 0de5e697820..18691678593 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -145,7 +145,7 @@ $event-sending-color: $text-secondary-color;
 $event-redacted-fg-color: #606060;
 $event-redacted-border-color: #000000;
 
-$event-highlight-fg-color: $warning-color;
+$event-highlight-fg-color: $primary-fg-color;
 $event-highlight-bg-color: #25271F;
 
 // event timestamp
diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss
index 1b9254d1005..57bfda487bb 100644
--- a/res/themes/light-custom/css/_custom.scss
+++ b/res/themes/light-custom/css/_custom.scss
@@ -70,6 +70,7 @@ $roomlist-bg-color: var(--roomlist-background-color);
 // --timeline-text-color
 $message-action-bar-fg-color: var(--timeline-text-color);
 $primary-fg-color: var(--timeline-text-color);
+$event-highlight-fg-color: var(--timeline-text-color);
 $settings-profile-overlay-placeholder-fg-color: var(--timeline-text-color);
 $roomtopic-color: var(--timeline-text-color-50pct);
 $tab-label-fg-color: var(--timeline-text-color);
@@ -116,7 +117,6 @@ $input-focused-border-color: var(--primary-color);
 //
 // --warning-color
 $button-danger-bg-color: var(--warning-color);
-$event-highlight-fg-color: var(--warning-color);
 $input-invalid-border-color: var(--warning-color);
 $mention-user-pill-bg-color: var(--warning-color);
 $notice-primary-color: var(--warning-color);
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index b6906d16be2..737fbde234b 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -224,7 +224,7 @@ $event-encrypting-color: #abddbc;
 $event-sending-color: #ddd;
 $event-notsent-color: #f44;
 
-$event-highlight-fg-color: $warning-color;
+$event-highlight-fg-color: $primary-fg-color;
 $event-highlight-bg-color: $yellow-background;
 
 // event redaction