diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart
index 3fdd55ece..27abf0d31 100644
--- a/lib/pages/chat/events/message_content.dart
+++ b/lib/pages/chat/events/message_content.dart
@@ -123,7 +123,9 @@ class MessageContent extends StatelessWidget {
     final fontSize = AppConfig.messageFontSize * AppConfig.fontSizeFactor;
     final buttonTextColor = textColor;
     switch (event.type) {
-      case EventTypes.Message:
+      // #Pangea
+      // case EventTypes.Message:
+      // Pangea#
       case EventTypes.Encrypted:
         // #Pangea
         return _ButtonContent(
@@ -133,6 +135,7 @@ class MessageContent extends StatelessWidget {
           label: L10n.of(context)!.encrypted,
           fontSize: fontSize,
         );
+      case EventTypes.Message:
       // Pangea#
       case EventTypes.Sticker:
         switch (event.messageType) {
diff --git a/lib/pangea/extensions/client_extension.dart b/lib/pangea/extensions/client_extension.dart
index f5a32c95e..985773f5d 100644
--- a/lib/pangea/extensions/client_extension.dart
+++ b/lib/pangea/extensions/client_extension.dart
@@ -117,7 +117,12 @@ extension PangeaClient on Client {
   // set description to let people know what the hell it is
   Future<Room> getMyAnalyticsRoom(String langCode) async {
     await roomsLoading;
-
+    // ensure room state events (room create,
+    // to check for analytics type) are loaded
+    for (final room in rooms) {
+      if (room.partial) await room.postLoad();
+    }
+    
     final Room? analyticsRoom = analyticsRoomLocal(langCode);
 
     if (analyticsRoom != null) return analyticsRoom;