diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 4ad37779881589aace2e2294e2ebc33dabdca53d..e8c48fa7e1f9843849016c4e350c975dd8ebb5b5 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1200,7 +1200,7 @@ public class ConversationFragment extends XmppFragment
                 break;
             case ATTACHMENT_CHOICE_CHOOSE_IMAGE: {
                 final Uri takePhotoUri = pendingTakePhotoUri.pop();
-                if (takePhotoUri != null && data.getData() == null && data.getClipData() == null) {
+                if (takePhotoUri != null && (data == null || (data.getData() == null && data.getClipData() == null))) {
                     mediaPreviewAdapter.addMediaPreviews(
                             Attachment.of(getActivity(), takePhotoUri, Attachment.Type.IMAGE));
                 }