diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 8901d69bf..88a0573d1 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -181,7 +181,7 @@ public class NotificationService {
 	public void push(final Message message) {
 		synchronized (CATCHUP_LOCK) {
 			final XmppConnection connection = message.getConversation().getAccount().getXmppConnection();
-			if (connection.isWaitingForSmCatchup()) {
+			if (connection != null && connection.isWaitingForSmCatchup()) {
 				connection.incrementSmCatchupMessageCounter();
 				pushFromBacklog(message);
 			} else {