1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java b/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java
index edca88f78..dd69b2337 100644
--- a/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java
+++ b/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java
@@ -66,6 +66,9 @@ public class ConversationMenuConfigurator {
     }
 
     public static void configureAttachmentMenu(@NonNull Conversation conversation, Menu menu, Boolean Quick_share_attachment_choice, boolean hasAttachments) {
+        if (menu == null) {
+            return;
+        }
         final MenuItem menuAttach = menu.findItem(R.id.action_attach_file);
         if (Quick_share_attachment_choice && !hasAttachments) {
             menuAttach.setVisible(false);