diff --git a/Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift b/Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift
index 6f548f9ca..16af8c4d5 100644
--- a/Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift
+++ b/Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift
@@ -78,15 +78,6 @@ class RoomInfoBasicView: UIView {
     func configure(withViewData viewData: RoomInfoBasicViewData) {
         let avatarImage = AvatarGenerator.generateAvatar(forMatrixItem: viewData.roomId, withDisplayName: viewData.roomDisplayName)
         
-        if BWIBuildSettings.shared.bwiUseCustomPersonalNotesAvatar {
-            if let session = AppDelegate.theDelegate().mxSessions.first as? MXSession {
-                let service = PersonalNotesDefaultService(mxSession: session)
-                if let personalNotesRoomId = service.personalNotesRoomId(), personalNotesRoomId == viewData.roomId {
-                    avatarImageView.image = UIImage(named: service.avatarImageUrl())
-                }
-            }
-        }
-        
         // bwi: update room avatar
         if let avatarUrl = viewData.avatarUrl {
             if !avatarUrl.isEmpty {
@@ -105,6 +96,15 @@ class RoomInfoBasicView: UIView {
         } else {
             avatarImageView.image = avatarImage
         }
+        
+        if BWIBuildSettings.shared.bwiUseCustomPersonalNotesAvatar {
+            if let session = AppDelegate.theDelegate().mxSessions.first as? MXSession {
+                let service = PersonalNotesDefaultService(mxSession: session)
+                if let personalNotesRoomId = service.personalNotesRoomId(), personalNotesRoomId == viewData.roomId {
+                    avatarImageView.image = UIImage(named: service.avatarImageUrl())
+                }
+            }
+        }
 
         badgeImageView.image = viewData.encryptionImage
         roomNameLabel.text = viewData.roomDisplayName