diff --git a/lib/pangea/course_chats/course_chats_page.dart b/lib/pangea/course_chats/course_chats_page.dart
index 6945aadfe..1b962497b 100644
--- a/lib/pangea/course_chats/course_chats_page.dart
+++ b/lib/pangea/course_chats/course_chats_page.dart
@@ -57,7 +57,9 @@ class CourseChatsController extends State<CourseChats>
 
   @override
   void initState() {
-    loadHierarchy(reload: true);
+    loadHierarchy(reload: true).then(
+      (_) => _joinDefaultChats(),
+    );
 
     // Listen for changes to the activeSpace's hierarchy,
     // and reload the hierarchy when they come through
@@ -212,7 +214,6 @@ class CourseChatsController extends State<CourseChats>
 
     try {
       await _loadHierarchy(activeSpace: room, reload: reload);
-      if (mounted) await _joinDefaultChats();
       if (mounted) {
         final futures = [
           loadRoomSummaries(
diff --git a/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart b/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart
index 65bd3119c..f15e1f119 100644
--- a/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart
+++ b/lib/utils/matrix_sdk_extensions/filtered_timeline_extension.dart
@@ -64,7 +64,8 @@ extension IsStateExtension on Event {
   bool get isVisibleInPangeaGui {
     if (!room.showActivityChatUI) {
       return type != EventTypes.RoomMember ||
-          roomMemberChangeType != RoomMemberChangeType.avatar;
+          (roomMemberChangeType != RoomMemberChangeType.avatar &&
+              roomMemberChangeType != RoomMemberChangeType.other);
     }
 
     return type != EventTypes.RoomMember;