diff --git a/lib/pangea/activity_sessions/activity_session_chat/activity_stats_menu.dart b/lib/pangea/activity_sessions/activity_session_chat/activity_stats_menu.dart
index 52890bc1d..ef96f27e4 100644
--- a/lib/pangea/activity_sessions/activity_session_chat/activity_stats_menu.dart
+++ b/lib/pangea/activity_sessions/activity_session_chat/activity_stats_menu.dart
@@ -64,7 +64,9 @@ class ActivityStatsMenu extends StatelessWidget {
     final isColumnMode = FluffyThemes.isColumnMode(context);
 
     // Completion status variables
-    final bool userComplete = controller.room.hasCompletedRole;
+    final bool userComplete =
+        controller.room.hasPickedRole && controller.room.hasCompletedRole;
+
     final bool activityComplete = controller.room.isActivityFinished;
     bool shouldShowEndForAll = true;
     bool shouldShowImDone = true;
@@ -160,7 +162,7 @@ class ActivityStatsMenu extends StatelessWidget {
                 ),
               ],
             ),
-            if (!userComplete) ...[
+            if (!userComplete && (shouldShowImDone || shouldShowEndForAll)) ...[
               Text(
                 L10n.of(context).activityDropdownDesc,
                 textAlign: TextAlign.center,
diff --git a/lib/pangea/course_plans/courses/course_plan_room_extension.dart b/lib/pangea/course_plans/courses/course_plan_room_extension.dart
index a1ef6f660..5c7207d06 100644
--- a/lib/pangea/course_plans/courses/course_plan_room_extension.dart
+++ b/lib/pangea/course_plans/courses/course_plan_room_extension.dart
@@ -31,7 +31,8 @@ extension CoursePlanRoomExtension on Room {
       final room = client.getRoomById(child.roomId!);
       if (room?.membership == Membership.join &&
           room?.activityId == activityId &&
-          !room!.hasArchivedActivity) {
+          room!.hasPickedRole &&
+          !room.hasCompletedRole) {
         return room.id;
       }
     }
diff --git a/pubspec.yaml b/pubspec.yaml
index bdadb9637..6dfb452fe 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -6,7 +6,7 @@ description: Learn a language while texting your friends.
 # Pangea#
 publish_to: none
 # On version bump also increase the build number for F-Droid
-version: 4.1.16+4
+version: 4.1.16+5
 
 environment:
   sdk: ">=3.0.0 <4.0.0"