diff --git a/lib/pages/chat/events/html_message.dart b/lib/pages/chat/events/html_message.dart
index f4573a893..29344e495 100644
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@@ -55,6 +55,7 @@ class HtmlMessage extends StatelessWidget {
           themeData.textTheme.bodyMedium!.copyWith(
             color: themeData.colorScheme.secondary,
             decoration: TextDecoration.underline,
+            decorationColor: themeData.colorScheme.secondary,
           ),
       shrinkToFit: true,
       maxLines: maxLines,
diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart
index 62bab3260..b59f254b5 100644
--- a/lib/pages/chat/events/message_content.dart
+++ b/lib/pages/chat/events/message_content.dart
@@ -154,6 +154,7 @@ class MessageContent extends StatelessWidget {
                   color: textColor.withAlpha(150),
                   fontSize: bigEmotes ? fontSize * 3 : fontSize,
                   decoration: TextDecoration.underline,
+                  decorationColor: textColor.withAlpha(150),
                 ),
                 room: event.room,
                 emoteSize: bigEmotes ? fontSize * 3 : fontSize * 1.5,
@@ -243,6 +244,7 @@ class MessageContent extends StatelessWidget {
                       color: textColor.withAlpha(150),
                       fontSize: bigEmotes ? fontSize * 3 : fontSize,
                       decoration: TextDecoration.underline,
+                      decorationColor: textColor.withAlpha(150),
                     ),
                     onLinkTap: (url) => UrlLauncher(context, url).launchUrl(),
                   );
diff --git a/lib/pages/chat/pinned_events.dart b/lib/pages/chat/pinned_events.dart
index 9618ead78..e6e0ec786 100644
--- a/lib/pages/chat/pinned_events.dart
+++ b/lib/pages/chat/pinned_events.dart
@@ -121,6 +121,9 @@ class PinnedEvents extends StatelessWidget {
                                     .onSurfaceVariant,
                                 fontSize: fontSize,
                                 decoration: TextDecoration.underline,
+                                decorationColor: Theme.of(context)
+                                    .colorScheme
+                                    .onSurfaceVariant,
                               ),
                               onLinkTap: (url) =>
                                   UrlLauncher(context, url).launchUrl(),
diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart
index 537a276e8..62bd29360 100644
--- a/lib/pages/chat_details/chat_details_view.dart
+++ b/lib/pages/chat_details/chat_details_view.dart
@@ -136,6 +136,10 @@ class ChatDetailsView extends StatelessWidget {
                                         .textTheme
                                         .bodyMedium!
                                         .color,
+                                    decorationColor: Theme.of(context)
+                                        .textTheme
+                                        .bodyMedium!
+                                        .color,
                                   ),
                                   onLinkTap: (url) =>
                                       UrlLauncher(context, url).launchUrl(),
diff --git a/lib/pages/story/story_view.dart b/lib/pages/story/story_view.dart
index f172f930b..18725384b 100644
--- a/lib/pages/story/story_view.dart
+++ b/lib/pages/story/story_view.dart
@@ -280,6 +280,7 @@ class StoryView extends StatelessWidget {
                         fontSize: 24,
                         color: Colors.blue.shade50,
                         decoration: TextDecoration.underline,
+                        decorationColor: Colors.blue.shade50,
                         shadows: event.messageType == MessageTypes.Text
                             ? null
                             : textShadows,