diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 5c6f263af9d7b20597dff87fe8cf048029be44e0..e43755c90e913cc3565c1e852f868052f74d4d66 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -1280,12 +1280,13 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
 
         public boolean equals(Object o) {
             if (!(o instanceof FileParams)) return false;
+            if (url == null) return false;
 
             return url.equals(((FileParams) o).url);
         }
 
         public int hashCode() {
-            return url.hashCode();
+            return url == null ? super.hashCode() : url.hashCode();
         }
     }