diff --git a/bwi/PersonalNotes/PersonalNotesDefaultService.swift b/bwi/PersonalNotes/PersonalNotesDefaultService.swift
index 67a222e11..1550f695f 100644
--- a/bwi/PersonalNotes/PersonalNotesDefaultService.swift
+++ b/bwi/PersonalNotes/PersonalNotesDefaultService.swift
@@ -141,12 +141,14 @@ extension PersonalNotesDefaultService : PersonalNotesService {
     
     func setAsFavoriteIfNeeded() {
         if let room = self.session.room(withRoomId: self.personalNotesRoomId()) {
-            if room.accountData.tags[kMXRoomTagFavourite] == nil {
-                let tagOrder = self.session.tagOrderToBe(at: 0, from: UInt(NSNotFound), withTag: kMXRoomTagFavourite) ?? ""
-                room.replaceTag(kMXRoomTagFavourite, with: kMXRoomTagFavourite, withOrder: tagOrder) { (response) in
-                    // check old settings
-                    let layoutSettings = AllChatsLayoutSettingsManager.shared.allChatLayoutSettings
-                    PersonalNotesSettings().personalNotesVisible = layoutSettings.sections.contains(.bwiPersonalNotes)
+            if let accountData = room.accountData {
+                if accountData.tags[kMXRoomTagFavourite] == nil {
+                    let tagOrder = self.session.tagOrderToBe(at: 0, from: UInt(NSNotFound), withTag: kMXRoomTagFavourite) ?? ""
+                    room.replaceTag(kMXRoomTagFavourite, with: kMXRoomTagFavourite, withOrder: tagOrder) { (response) in
+                        // check old settings
+                        let layoutSettings = AllChatsLayoutSettingsManager.shared.allChatLayoutSettings
+                        PersonalNotesSettings().personalNotesVisible = layoutSettings.sections.contains(.bwiPersonalNotes)
+                    }
                 }
             }
         }