diff --git a/lib/pages/chat_details/chat_details.dart b/lib/pages/chat_details/chat_details.dart
index e895edc4..2566cf4d 100644
--- a/lib/pages/chat_details/chat_details.dart
+++ b/lib/pages/chat_details/chat_details.dart
@@ -286,11 +286,10 @@ class ChatDetailsController extends State<ChatDetails> {
             actions: actions,
           );
     if (action == null) return;
-    final matrix = Matrix.of(context);
     if (action == AvatarAction.remove) {
       await showFutureLoadingDialog(
         context: context,
-        future: () => matrix.client.setAvatarUrl(matrix.client.userID, null),
+        future: () => room.setAvatar(null),
       );
       return;
     }
diff --git a/lib/pages/settings/settings.dart b/lib/pages/settings/settings.dart
index ea4c3e88..e42163f4 100644
--- a/lib/pages/settings/settings.dart
+++ b/lib/pages/settings/settings.dart
@@ -68,7 +68,7 @@ class SettingsController extends State<Settings> {
     if (action == AvatarAction.remove) {
       final success = await showFutureLoadingDialog(
         context: context,
-        future: () => matrix.client.setAvatarUrl(matrix.client.userID, null),
+        future: () => matrix.client.setAvatar(null),
       );
       if (success.error == null) {
         updateProfile();