diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 0f56f734c..d46529408 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -161,6 +161,7 @@ public class MessageParser extends AbstractParser implements
 					}
 				}
 			}
+			return null;
 		}
 
 		if (from.getResourcepart().equals(conversation.getMucOptions().getActualNick())) {