diff --git a/lib/pages/new_space/new_space.dart b/lib/pages/new_space/new_space.dart
index 10dbf41f7..79d8b980d 100644
--- a/lib/pages/new_space/new_space.dart
+++ b/lib/pages/new_space/new_space.dart
@@ -84,6 +84,15 @@ class NewSpaceController extends State<NewSpace> {
       ),
     );
 
+    if (avatar != null) {
+      events.add(
+        StateEvent(
+          type: sdk.EventTypes.RoomAvatar,
+          content: {'url': avatarUrl.toString()},
+        ),
+      );
+    }
+
     // commenting out pangea room rules in spaces for now
     // if (rulesEditorKey.currentState?.rules != null) {
     //   events.add(rulesEditorKey.currentState!.rules.toStateEvent);
@@ -198,10 +207,6 @@ class NewSpaceController extends State<NewSpace> {
         space.updateRoomCapacity(capacity);
       }
 
-      if (avatar != null && space != null) {
-        space.setAvatar(MatrixFile(bytes: avatar, name: 'Avatar'));
-      }
-
       final Room? room = Matrix.of(context).client.getRoomById(spaceId);
       if (room == null) {
         ErrorHandler.logError(