diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index e5d677e57..dcaa14006 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -123,9 +123,20 @@ class ChatView extends StatelessWidget {
     //       ),
     //   ];
     // } else
-    // Pangea#
-    if (!controller.room.isArchived) {
-      // #Pangea
+    // if (!controller.room.isArchived) {
+    // return [
+    //   if (AppConfig.experimentalVoip &&
+    //       Matrix.of(context).voipPlugin != null &&
+    //       controller.room.isDirectChat)
+    //     IconButton(
+    //       onPressed: controller.onPhoneButtonTap,
+    //       icon: const Icon(Icons.call_outlined),
+    //       tooltip: L10n.of(context).placeCall,
+    //     ),
+    //   EncryptionButton(controller.room),
+    //   ChatSettingsPopupMenu(controller.room, true),
+    // ];
+    if (!(controller.room.isArchived || controller.room.hasArchivedActivity)) {
       return [
         if (controller.room.activityPlan == null ||
             !controller.room.showActivityChatUI)
@@ -148,18 +159,6 @@ class ChatView extends StatelessWidget {
           },
         ),
       ];
-      // return [
-      //   if (AppConfig.experimentalVoip &&
-      //       Matrix.of(context).voipPlugin != null &&
-      //       controller.room.isDirectChat)
-      //     IconButton(
-      //       onPressed: controller.onPhoneButtonTap,
-      //       icon: const Icon(Icons.call_outlined),
-      //       tooltip: L10n.of(context).placeCall,
-      //     ),
-      //   EncryptionButton(controller.room),
-      //   ChatSettingsPopupMenu(controller.room, true),
-      // ];
       // Pangea#
     }
     return [];
diff --git a/lib/pangea/analytics_misc/get_analytics_controller.dart b/lib/pangea/analytics_misc/get_analytics_controller.dart
index 3b1c7b085..78cda3b37 100644
--- a/lib/pangea/analytics_misc/get_analytics_controller.dart
+++ b/lib/pangea/analytics_misc/get_analytics_controller.dart
@@ -596,7 +596,19 @@ class GetAnalyticsController extends BaseController {
     final Room? analyticsRoom = _client.analyticsRoomLocal(_l2!);
     if (analyticsRoom == null) return [];
     final ids = analyticsRoom.activityRoomIds;
-    return ids.map((id) => _client.getRoomById(id)).whereType<Room>().toList();
+    return ids
+        .map((id) => _client.getRoomById(id))
+        .whereType<Room>()
+        .where(
+          (room) =>
+              room.membership != Membership.leave &&
+              room.membership != Membership.ban,
+        )
+        .toList();
+  }
+
+  int get archivedActivitiesCount {
+    return archivedActivities.length;
   }
 }
 
diff --git a/lib/pangea/analytics_summary/learning_progress_indicators.dart b/lib/pangea/analytics_summary/learning_progress_indicators.dart
index 3b2b7f14c..e75c03d35 100644
--- a/lib/pangea/analytics_summary/learning_progress_indicators.dart
+++ b/lib/pangea/analytics_summary/learning_progress_indicators.dart
@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 
 import 'package:fluffychat/config/themes.dart';
-import 'package:fluffychat/pangea/analytics_misc/client_analytics_extension.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_list_model.dart';
 import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
 import 'package:fluffychat/pangea/analytics_misc/get_analytics_controller.dart';
@@ -13,7 +12,6 @@ import 'package:fluffychat/pangea/analytics_summary/learning_progress_bar.dart';
 import 'package:fluffychat/pangea/analytics_summary/learning_progress_indicator_button.dart';
 import 'package:fluffychat/pangea/analytics_summary/progress_indicator.dart';
 import 'package:fluffychat/pangea/analytics_summary/progress_indicators_enum.dart';
-import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
 import 'package:fluffychat/pangea/learning_settings/pages/settings_learning.dart';
 import 'package:fluffychat/widgets/hover_builder.dart';
 import 'package:fluffychat/widgets/matrix.dart';
@@ -155,12 +153,8 @@ class LearningProgressIndicatorsState
                                 ),
                                 const SizedBox(width: 6.0),
                                 AnimatedFloatingNumber(
-                                  number: Matrix.of(context)
-                                          .client
-                                          .analyticsRoomLocal()
-                                          ?.activityRoomIds
-                                          .length ??
-                                      0,
+                                  number: MatrixState.pangeaController
+                                      .getAnalytics.archivedActivitiesCount,
                                 ),
                               ],
                             ),