diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
index 81768d389..e9acd9979 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyListFragment.java
@@ -148,12 +148,13 @@ public class NearbyListFragment extends DaggerFragment {
         if (resultCode == RESULT_OK) {
             Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);
+            String wikidataEntityId = directPrefs.getString("WikiDataEntityId", null);
             if (requestCode == ContributionController.SELECT_FROM_CAMERA) {
                 // If coming from camera, pass null as uri. Because camera photos get saved to a
                 // fixed directory
-                controller.handleImagePicked(requestCode, null, true, null);
+                controller.handleImagePicked(requestCode, null, true, wikidataEntityId);
             } else {
-                controller.handleImagePicked(requestCode, data.getData(), true, null);
+                controller.handleImagePicked(requestCode, data.getData(), true, wikidataEntityId);
             }
         } else {
             Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
index bb2d9c671..ba23b8e1a 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
@@ -770,12 +770,13 @@ public class NearbyMapFragment extends DaggerFragment {
         if (resultCode == RESULT_OK) {
             Timber.d("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
                     requestCode, resultCode, data);
+            String wikidataEntityId = directPrefs.getString("WikiDataEntityId", null);
             if (requestCode == ContributionController.SELECT_FROM_CAMERA) {
                 // If coming from camera, pass null as uri. Because camera photos get saved to a
                 // fixed directory
-                controller.handleImagePicked(requestCode, null, true, null);
+                controller.handleImagePicked(requestCode, null, true, wikidataEntityId);
             } else {
-                controller.handleImagePicked(requestCode, data.getData(), true, null);
+                controller.handleImagePicked(requestCode, data.getData(), true, wikidataEntityId);
             }
         } else {
             Timber.e("OnActivityResult() parameters: Req code: %d Result code: %d Data: %s",
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
index 0d33b4a5e..7170e4c02 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
@@ -31,6 +31,8 @@ import fr.free.nrw.commons.contributions.ContributionController;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
 import timber.log.Timber;
 
+import static fr.free.nrw.commons.wikidata.WikidataConstants.WIKIDATA_ENTITY_ID_PREF;
+
 public class PlaceRenderer extends Renderer<Place> {
 
     @BindView(R.id.tvName) TextView tvName;
@@ -126,6 +128,7 @@ public class PlaceRenderer extends Renderer<Place> {
         editor.putString("Title", place.getName());
         editor.putString("Desc", place.getLongDescription());
         editor.putString("Category", place.getCategory());
+        editor.putString(WIKIDATA_ENTITY_ID_PREF, place.getWikiDataEntityId());
         editor.apply();
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java
index b5aa4f514..bbfd1b029 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java
@@ -114,9 +114,6 @@ public class UploadController {
             contribution.setTag("mimeType", mimeType);
             contribution.setSource(source);
 
-            //Calls the next overloaded method
-            startUpload(contribution, onComplete);
-
         Timber.d("Wikidata entity ID received from Share activity is %s", wikiDataEntityId);
         //TODO: Modify this to include coords
         Account currentAccount = sessionManager.getCurrentAccount();
@@ -136,7 +133,8 @@ public class UploadController {
         contribution.setWikiDataEntityId(wikiDataEntityId);
         contribution.setContentProviderUri(contentProviderUri);
 
-
+        //Calls the next overloaded method
+        startUpload(contribution, onComplete);
     }
 
     /**