         Bundle.mxk_customizeLocalizedStringTableName("Vector")
         
         if let userAccount = MXKAccountManager.shared()?.activeAccounts.first {
-            if NotificationService.store == nil {
-                NotificationService.store = NSEMemoryStore(withCredentials: userAccount.mxCredentials)
-            } else {
-                NSLog("[NotificationService] Instance: Reusing store")
-            }
-            
             if NotificationService.mxSession == nil {
+                let store = NSEMemoryStore(withCredentials: userAccount.mxCredentials)
                 NotificationService.mxSession = MXSession(matrixRestClient: MXRestClient(credentials: userAccount.mxCredentials, unrecognizedCertificateHandler: nil))
-                NotificationService.mxSession?.setStore(NotificationService.store, completion: { (response) in
+                NotificationService.mxSession?.setStore(store, completion: { (response) in
                     switch response {
                     case .success:
                         completion()

    /// Cached events. Keys are eventId's
    var cachedEvents: [String: MXEvent] = [:]
    static var mxSession: MXSession?
    static var store: NSEMemoryStore!
    lazy var showDecryptedContentInNotifications: Bool = {
        return RiotSettings.shared.showDecryptedContentInNotifications
    }()

                    msgType = nil
                }
                
                let roomDisplayName = session.store.summary?(ofRoom: room.roomId)?.displayname
                let myUserId = session.myUser.userId
                let isIncomingEvent = event.sender != myUserId
                
