diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
index 1bd17e749..85f09bbd5 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
@@ -234,9 +234,7 @@ public class ContributionController {
     private void initiateGalleryUpload(final Activity activity, ActivityResultLauncher<Intent> resultLauncher,
         final boolean allowMultipleUploads) {
         setPickerConfiguration(activity, allowMultipleUploads);
-        boolean openDocumentIntentPreferred = defaultKvStore.getBoolean(
-            "openDocumentPhotoPickerPref", true);
-        FilePicker.openGallery(activity, resultLauncher,0, openDocumentIntentPreferred);
+        FilePicker.openGallery(activity, resultLauncher,0, isDocumentPhotoPickerPreferred());
     }
 
     /**
@@ -262,8 +260,17 @@ public class ContributionController {
         FilePicker.openCameraForImage(activity, resultLauncher,0);
     }
 
+    private boolean isDocumentPhotoPickerPreferred(){
+        return defaultKvStore.getBoolean(
+            "openDocumentPhotoPickerPref", true);
+    }
+
     public void onPictureReturnedFromGallery(ActivityResult result, Activity activity, FilePicker.Callbacks callbacks){
-        FilePicker.onPictureReturnedFromGallery(result,activity,callbacks);
+        if(isDocumentPhotoPickerPreferred()){
+            FilePicker.onPictureReturnedFromDocuments(result, activity, callbacks);
+        } else {
+            FilePicker.onPictureReturnedFromGallery(result,activity,callbacks);
+        }
     }
 
     public void onPictureReturnedFromCustomSelector(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) {
diff --git a/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java b/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java
index 0c5cad6f2..cc709db61 100644
--- a/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java
+++ b/app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java
@@ -172,7 +172,7 @@ public class FilePicker implements Constants {
                     requestCode == RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR) {
                 if (resultCode == Activity.RESULT_OK) {
                     if (requestCode == RequestCodes.PICK_PICTURE_FROM_DOCUMENTS && !isPhoto(data)) {
-                        onPictureReturnedFromDocuments(data, activity, callbacks);
+//                        onPictureReturnedFromDocuments(data, activity, callbacks);
                     } else if (requestCode == RequestCodes.PICK_PICTURE_FROM_GALLERY && !isPhoto(data)) {
 //                        onPictureReturnedFromGallery(data, activity, callbacks);
                     } else if (requestCode == RequestCodes.PICK_PICTURE_FROM_CUSTOM_SELECTOR) {
@@ -248,18 +248,22 @@ public class FilePicker implements Constants {
         return intent;
     }
 
-    private static void onPictureReturnedFromDocuments(Intent data, Activity activity, @NonNull FilePicker.Callbacks callbacks) {
-        try {
-            Uri photoPath = data.getData();
-            UploadableFile photoFile = PickedFiles.pickedExistingPicture(activity, photoPath);
-            callbacks.onImagesPicked(singleFileList(photoFile), FilePicker.ImageSource.DOCUMENTS, restoreType(activity));
+    public static void onPictureReturnedFromDocuments(ActivityResult result, Activity activity, @NonNull FilePicker.Callbacks callbacks) {
+        if(result.getResultCode() == Activity.RESULT_OK){
+            try {
+                Uri photoPath = result.getData().getData();
+                UploadableFile photoFile = PickedFiles.pickedExistingPicture(activity, photoPath);
+                callbacks.onImagesPicked(singleFileList(photoFile), FilePicker.ImageSource.DOCUMENTS, restoreType(activity));
 
-            if (configuration(activity).shouldCopyPickedImagesToPublicGalleryAppFolder()) {
-                PickedFiles.copyFilesInSeparateThread(activity, singleFileList(photoFile));
+                if (configuration(activity).shouldCopyPickedImagesToPublicGalleryAppFolder()) {
+                    PickedFiles.copyFilesInSeparateThread(activity, singleFileList(photoFile));
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                callbacks.onImagePickerError(e, FilePicker.ImageSource.DOCUMENTS, restoreType(activity));
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-            callbacks.onImagePickerError(e, FilePicker.ImageSource.DOCUMENTS, restoreType(activity));
+        } else {
+            callbacks.onCanceled(FilePicker.ImageSource.DOCUMENTS, restoreType(activity));
         }
     }
 
@@ -310,7 +314,7 @@ public class FilePicker implements Constants {
                 e.printStackTrace();
                 callbacks.onImagePickerError(e, FilePicker.ImageSource.GALLERY, restoreType(activity));
             }
-        }else{
+        } else{
             callbacks.onCanceled(FilePicker.ImageSource.GALLERY, restoreType(activity));
         }
     }