diff --git a/lib/pangea/activity_planner/activity_finished_status_message.dart b/lib/pangea/activity_planner/activity_finished_status_message.dart
index 5f1abf1d6..944490440 100644
--- a/lib/pangea/activity_planner/activity_finished_status_message.dart
+++ b/lib/pangea/activity_planner/activity_finished_status_message.dart
@@ -54,13 +54,13 @@ class ActivityFinishedStatusMessageState
     if (_highlightedRole == null) {
       return -1; // No highlighted role
     }
-    return widget.room.activityRoles.indexOf(_highlightedRole!);
+    return rolesWithSummaries.indexOf(_highlightedRole!);
   }
 
   void _setDefaultHighlightedRole() {
     if (_hightlightedRoleIndex >= 0) return;
 
-    final roles = widget.room.activityRoles;
+    final roles = rolesWithSummaries;
     _highlightedRole = roles.firstWhereOrNull(
       (r) => r.userId == widget.room.client.userID,
     );
@@ -80,18 +80,18 @@ class ActivityFinishedStatusMessageState
       _hightlightedRoleIndex > 0 && _highlightedRole != null;
 
   bool get _canMoveRight =>
-      _hightlightedRoleIndex < widget.room.activityRoles.length - 1 &&
+      _hightlightedRoleIndex < rolesWithSummaries.length - 1 &&
       _highlightedRole != null;
 
   void _moveLeft() {
     if (_hightlightedRoleIndex > 0) {
-      _highlightRole(widget.room.activityRoles[_hightlightedRoleIndex - 1]);
+      _highlightRole(rolesWithSummaries[_hightlightedRoleIndex - 1]);
     }
   }
 
   void _moveRight() {
-    if (_hightlightedRoleIndex < widget.room.activityRoles.length - 1) {
-      _highlightRole(widget.room.activityRoles[_hightlightedRoleIndex + 1]);
+    if (_hightlightedRoleIndex < rolesWithSummaries.length - 1) {
+      _highlightRole(rolesWithSummaries[_hightlightedRoleIndex + 1]);
     }
   }
 
@@ -109,6 +109,16 @@ class ActivityFinishedStatusMessageState
         .sendActivityAnalytics(widget.room.id);
   }
 
+  List<ActivityRoleModel> get rolesWithSummaries {
+    if (widget.room.activitySummary == null) return <ActivityRoleModel>[];
+    final roles = widget.room.activityRoles;
+    return roles.where((role) {
+      return widget.room.activitySummary!.participants.any(
+        (p) => p.participantId == role.userId,
+      );
+    }).toList();
+  }
+
   @override
   Widget build(BuildContext context) {
     final summary = widget.room.activitySummary;
@@ -120,6 +130,7 @@ class ActivityFinishedStatusMessageState
     final user = widget.room.getParticipants().firstWhereOrNull(
           (u) => u.id == _highlightedRole?.userId,
         );
+
     final userSummary =
         widget.room.activitySummary?.participants.firstWhereOrNull(
       (p) => p.participantId == _highlightedRole!.userId,
@@ -182,9 +193,7 @@ class ActivityFinishedStatusMessageState
                       ),
                     ),
                   ),
-                  if (_highlightedRole != null &&
-                      user != null &&
-                      userSummary != null)
+                  if (_highlightedRole != null && userSummary != null)
                     ActivityResultsCarousel(
                       selectedRole: _highlightedRole!,
                       moveLeft: _canMoveLeft ? _moveLeft : null,
@@ -196,7 +205,7 @@ class ActivityFinishedStatusMessageState
                   Wrap(
                     spacing: 12.0,
                     runSpacing: 12.0,
-                    children: widget.room.activityRoles
+                    children: rolesWithSummaries
                         .map(
                           (role) => ActivityParticipantIndicator(
                             onTap: _highlightedRole == role
diff --git a/lib/pangea/activity_planner/activity_results_carousel.dart b/lib/pangea/activity_planner/activity_results_carousel.dart
index 65266d25e..9365249bd 100644
--- a/lib/pangea/activity_planner/activity_results_carousel.dart
+++ b/lib/pangea/activity_planner/activity_results_carousel.dart
@@ -10,19 +10,20 @@ import 'package:fluffychat/widgets/avatar.dart';
 
 class ActivityResultsCarousel extends StatelessWidget {
   final ActivityRoleModel selectedRole;
-  final User user;
   final ParticipantSummaryModel summary;
 
   final VoidCallback? moveLeft;
   final VoidCallback? moveRight;
 
+  final User? user;
+
   const ActivityResultsCarousel({
     super.key,
     required this.selectedRole,
     required this.moveLeft,
     required this.moveRight,
-    required this.user,
     required this.summary,
+    this.user,
   });
 
   @override
@@ -64,8 +65,9 @@ class ActivityResultsCarousel extends StatelessWidget {
                       alignment: Alignment.center,
                       child: Avatar(
                         size: isColumnMode ? 60.0 : 40.0,
-                        mxContent: user.avatarUrl,
-                        name: user.calcDisplayname(),
+                        mxContent: user?.avatarUrl,
+                        name: user?.calcDisplayname() ??
+                            summary.participantId.localpart,
                         userId: selectedRole.userId,
                       ),
                     ),