diff --git a/lib/pages/archive/archive.dart b/lib/pages/archive/archive.dart
index a3c35c347..78e735d05 100644
--- a/lib/pages/archive/archive.dart
+++ b/lib/pages/archive/archive.dart
@@ -1,13 +1,12 @@
-import 'package:flutter/material.dart';
-
 import 'package:adaptive_dialog/adaptive_dialog.dart';
+import 'package:fluffychat/pages/archive/archive_view.dart';
+import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/widgets/matrix.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:matrix/matrix.dart';
 
-import 'package:fluffychat/pages/archive/archive_view.dart';
-import 'package:fluffychat/widgets/matrix.dart';
-
 class Archive extends StatefulWidget {
   const Archive({super.key});
 
@@ -20,7 +19,12 @@ class ArchiveController extends State<Archive> {
 
   Future<List<Room>> getArchive(BuildContext context) async {
     if (archive.isNotEmpty) return archive;
-    return archive = await Matrix.of(context).client.loadArchive();
+    // #Pangea
+    //return archive = await Matrix.of(context).client.loadArchive();
+    return archive = (await Matrix.of(context).client.loadArchive())
+        .where((e) => (!e.isSpace && !e.isAnalyticsRoom))
+        .toList();
+    // Pangea#
   }
 
   void forgetRoomAction(int i) async {
diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart
index 57255ffc9..21789f527 100644
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@@ -116,7 +116,8 @@ class ChatView extends StatelessWidget {
       // #Pangea
     } else {
       return [
-        ChatSettingsPopupMenu(controller.room, !controller.room.isDirectChat),
+        ChatSettingsPopupMenu(controller.room,
+            (!controller.room.isDirectChat && !controller.room.isArchived)),
       ];
     }
 
diff --git a/lib/widgets/chat_settings_popup_menu.dart b/lib/widgets/chat_settings_popup_menu.dart
index f10f08ff7..781b8ab61 100644
--- a/lib/widgets/chat_settings_popup_menu.dart
+++ b/lib/widgets/chat_settings_popup_menu.dart
@@ -83,19 +83,22 @@ class ChatSettingsPopupMenuState extends State<ChatSettingsPopupMenu> {
                 ],
               ),
             ),
-      PopupMenuItem<String>(
-        value: 'leave',
-        child: Row(
-          children: [
-            // #Pangea
-            // const Icon(Icons.delete_outlined),
-            const Icon(Icons.arrow_forward),
-            // Pangea#
-            const SizedBox(width: 12),
-            Text(L10n.of(context)!.leave),
-          ],
+      // #Pangea
+      if (!widget.room.isArchived)
+        // Pangea#
+        PopupMenuItem<String>(
+          value: 'leave',
+          child: Row(
+            children: [
+              // #Pangea
+              // const Icon(Icons.delete_outlined),
+              const Icon(Icons.arrow_forward),
+              // Pangea#
+              const SizedBox(width: 12),
+              Text(L10n.of(context)!.leave),
+            ],
+          ),
         ),
-      ),
       // #Pangea
       if (classSettings != null)
         PopupMenuItem<String>(