diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 624c0a604..3199b4920 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -115,7 +115,9 @@ public class NotificationService {
 
 	public void pushFromBacklog(final Message message) {
 		if (notify(message)) {
-			pushToStack(message);
+			synchronized (notifications) {
+				pushToStack(message);
+			}
 		}
 	}