diff --git a/lib/pages/chat_list/client_chooser_button.dart b/lib/pages/chat_list/client_chooser_button.dart
index da9b27f4..28b4669a 100644
--- a/lib/pages/chat_list/client_chooser_button.dart
+++ b/lib/pages/chat_list/client_chooser_button.dart
@@ -213,15 +213,12 @@ class ClientChooserButton extends StatelessWidget {
             child: Material(
               color: Colors.transparent,
               borderRadius: BorderRadius.circular(99),
-              child: Hero(
-                tag: 'profilesettings',
-                child: Avatar(
-                  mxContent: snapshot.data?.avatarUrl,
-                  name: snapshot.data?.displayName ??
-                      matrix.client.userID!.localpart,
-                  size: 28,
-                  fontSize: 12,
-                ),
+              child: Avatar(
+                mxContent: snapshot.data?.avatarUrl,
+                name: snapshot.data?.displayName ??
+                    matrix.client.userID!.localpart,
+                size: 28,
+                fontSize: 12,
               ),
             ),
           ),
diff --git a/lib/pages/settings/settings_view.dart b/lib/pages/settings/settings_view.dart
index e93936f0..19d57f0c 100644
--- a/lib/pages/settings/settings_view.dart
+++ b/lib/pages/settings/settings_view.dart
@@ -66,14 +66,11 @@ class SettingsView extends StatelessWidget {
                                 borderRadius: BorderRadius.circular(
                                     Avatar.defaultSize * 2.5),
                               ),
-                              child: Hero(
-                                tag: 'profilesettings',
-                                child: Avatar(
-                                  mxContent: profile?.avatarUrl,
-                                  name: displayname,
-                                  size: Avatar.defaultSize * 2.5,
-                                  fontSize: 18 * 2.5,
-                                ),
+                              child: Avatar(
+                                mxContent: profile?.avatarUrl,
+                                name: displayname,
+                                size: Avatar.defaultSize * 2.5,
+                                fontSize: 18 * 2.5,
                               ),
                             ),
                             if (profile != null)