diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index a9a52b85f34ad23123ecd28707759660229032f3..4fc2cbfdc0500308de81ba7075d1433a7d6b3737 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1196,13 +1196,19 @@ public class ConversationFragment extends XmppFragment
             case REQUEST_START_VIDEO_CALL:
                 triggerRtpSession(RtpSessionActivity.ACTION_MAKE_VIDEO_CALL);
                 break;
-            case ATTACHMENT_CHOICE_CHOOSE_IMAGE:
+            case ATTACHMENT_CHOICE_CHOOSE_IMAGE: {
+                final Uri takePhotoUri = pendingTakePhotoUri.pop();
+                if (takePhotoUri != null && data.getData() == null && data.getClipData() == null) {
+                    mediaPreviewAdapter.addMediaPreviews(
+                            Attachment.of(getActivity(), takePhotoUri, Attachment.Type.IMAGE));
+                }
                 final List<Attachment> imageUris =
                         Attachment.extractAttachments(getActivity(), data, Attachment.Type.IMAGE);
                 mediaPreviewAdapter.addMediaPreviews(imageUris);
                 toggleInputMethod();
                 break;
-            case ATTACHMENT_CHOICE_TAKE_PHOTO:
+            }
+            case ATTACHMENT_CHOICE_TAKE_PHOTO: {
                 final Uri takePhotoUri = pendingTakePhotoUri.pop();
                 if (takePhotoUri != null) {
                     mediaPreviewAdapter.addMediaPreviews(
@@ -1212,6 +1218,7 @@ public class ConversationFragment extends XmppFragment
                     Log.d(Config.LOGTAG, "lost take photo uri. unable to to attach");
                 }
                 break;
+            }
             case ATTACHMENT_CHOICE_CHOOSE_FILE:
             case ATTACHMENT_CHOICE_RECORD_VIDEO:
             case ATTACHMENT_CHOICE_RECORD_VOICE: