                     return
                 }
                 NSLog("[NotificationService] fetchEvent: MXSession.event method returned error: \(String(describing: error))")
-                self.fallbackToOriginalContent()
-            }
-        }
-    }
-    
-    func launchBackgroundSync() {
+                self.fallbackToOriginalContent(forEventId: eventId)
+            }
+        }
+    }
+    
+    func launchBackgroundSync(forEventId eventId: String) {
         guard let mxSession = mxSession else {
             NSLog("[NotificationService] launchBackgroundSync: mxSession is missing.")
-            self.fallbackToOriginalContent()
+            self.fallbackToOriginalContent(forEventId: eventId)
             return
         }
 

    
    func processEvent(_ event: MXEvent) {
        guard let content = originalContent, let mxSession = mxSession else {
            self.fallbackToOriginalContent()
            return
        }


        }
        
        //  call contentHandler
        contentHandlers[eventId]?(content)
    }
    
    func notificationContent(forEvent event: MXEvent, inSession session: MXSession, onComplete: @escaping (UNNotificationContent?) -> Void) {
