diff --git a/lib/pangea/activity_planner/activity_plan_message.dart b/lib/pangea/activity_planner/activity_plan_message.dart
index 365ddd4ce..e376a326b 100644
--- a/lib/pangea/activity_planner/activity_plan_message.dart
+++ b/lib/pangea/activity_planner/activity_plan_message.dart
@@ -36,7 +36,9 @@ class ActivityPlanMessage extends StatelessWidget {
     });
 
     final theme = Theme.of(context);
-    final color = ThemeData.dark().colorScheme.onSecondary;
+    final color = theme.brightness == Brightness.dark
+        ? theme.colorScheme.onSecondary
+        : theme.colorScheme.primary;
     final textColor = ThemeData.light().colorScheme.onPrimary;
 
     final displayEvent = event.getDisplayEvent(timeline);
diff --git a/lib/pangea/toolbar/widgets/overlay_message.dart b/lib/pangea/toolbar/widgets/overlay_message.dart
index 8be0ed518..092658f7e 100644
--- a/lib/pangea/toolbar/widgets/overlay_message.dart
+++ b/lib/pangea/toolbar/widgets/overlay_message.dart
@@ -90,7 +90,9 @@ class OverlayMessage extends StatelessWidget {
     }
 
     if (event.isActivityMessage) {
-      color = ThemeData.dark().colorScheme.onSecondary;
+      color = theme.brightness == Brightness.dark
+          ? theme.colorScheme.onSecondary
+          : theme.colorScheme.primary;
     }
 
     final noBubble = {