diff --git a/changelog.d/4100.feature b/changelog.d/4100.feature
new file mode 100644
index 0000000000000000000000000000000000000000..a3f7dbdcdd7ee0e54e9c927cc919d9154356e151
--- /dev/null
+++ b/changelog.d/4100.feature
@@ -0,0 +1 @@
+Support for replacing rooms with new ones
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 8e48c1ca6a90f45bf30006c744e9a3c4b64bc84e..c59c02527c709a7faa5a4c26375419a070bde83e 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -228,7 +228,8 @@ class RoomCreationHandler(BaseHandler):
             (EventTypes.Name, ""),
             (EventTypes.Topic, ""),
             (EventTypes.RoomHistoryVisibility, ""),
-            (EventTypes.GuestAccess, "")
+            (EventTypes.GuestAccess, ""),
+            (EventTypes.RoomAvatar, ""),
         )
 
         old_room_state_ids = yield self.store.get_filtered_current_state_ids(