diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 7c19680cc75242b9ccd6139d2e301a6f07714b8a..c78a6660fc5b02bd7c68114282ac9ce74908fc92 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -1465,7 +1465,7 @@ public class MessageParser extends AbstractParser
                                     message.markUnread();
                                     c.add(message);
                                     mXmppConnectionService.getNotificationService().possiblyMissedCall(c.getUuid() + sessionId, message);
-                                    query.incrementActualMessageCount();
+                                    if (query != null) query.incrementActualMessageCount();
                                     mXmppConnectionService.databaseBackend.createMessage(message);
                                 }
                             } else if ("proceed".equals(action)) {
@@ -1486,7 +1486,7 @@ public class MessageParser extends AbstractParser
                                     message.setTime(timestamp);
                                     message.markRead();
                                     mXmppConnectionService.getNotificationService().possiblyMissedCall(c.getUuid() + sessionId, message);
-                                    query.incrementActualMessageCount();
+                                    if (query != null) query.incrementActualMessageCount();
                                     mXmppConnectionService.updateMessage(message, true);
                                 } else {
                                     Log.d(