diff --git a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
index 3b52eb7a8f9a65c77a4daa5ef72db1c63a629db8..9fc1f58dbbfb4e64034de0079f76e29577a3ef31 100644
--- a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
+++ b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
@@ -763,6 +763,10 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
         }
 
         public boolean isImplausibleFrom(final Jid from) {
+            if (from instanceof Jid.Invalid) {
+                Log.w(Config.LOGTAG, "Invalid JID found in MAM query: " + from);
+                return true;
+            }
             if (muc()) {
                 if (from == null) {
                     return true;