diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart
index 79a22ba2a..05c87bef8 100644
--- a/lib/pages/chat/events/message_content.dart
+++ b/lib/pages/chat/events/message_content.dart
@@ -328,6 +328,10 @@ class MessageContent extends StatelessWidget {
             if (event.messageType == MessageTypes.Emote) {
               html = '* $html';
             }
+
+            final bigEmotes = event.onlyEmotes &&
+                event.numberEmotes > 0 &&
+                event.numberEmotes <= 3;
             return Padding(
               padding: const EdgeInsets.symmetric(
                 horizontal: 16,
@@ -337,7 +341,9 @@ class MessageContent extends StatelessWidget {
                 html: html,
                 textColor: textColor,
                 room: event.room,
-                fontSize: AppConfig.fontSizeFactor * AppConfig.messageFontSize,
+                fontSize: AppConfig.fontSizeFactor *
+                    AppConfig.messageFontSize *
+                    (bigEmotes ? 5 : 1),
                 limitHeight: !selected,
                 linkStyle: TextStyle(
                   color: linkColor,
diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart
index 40fefe3fc..a9b13e731 100644
--- a/lib/pages/chat_list/client_chooser_button.dart
+++ b/lib/pages/chat_list/client_chooser_button.dart
@@ -156,7 +156,7 @@ class ClientChooserButton extends StatelessWidget {
     var clientCount = 0;
     matrix.accountBundles.forEach((key, value) => clientCount += value.length);
     return FutureBuilder<Profile>(
-      future: matrix.client.fetchOwnProfile(),
+      future: matrix.client.isLogged() ? matrix.client.fetchOwnProfile() : null,
       builder: (context, snapshot) => Material(
         clipBehavior: Clip.hardEdge,
         borderRadius: BorderRadius.circular(99),
@@ -171,7 +171,7 @@ class ClientChooserButton extends StatelessWidget {
             child: Avatar(
               mxContent: snapshot.data?.avatarUrl,
               name:
-                  snapshot.data?.displayName ?? matrix.client.userID!.localpart,
+                  snapshot.data?.displayName ?? matrix.client.userID?.localpart,
               size: 32,
             ),
           ),