diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadItem.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadItem.java
index 13a797006..0d76ba57c 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadItem.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadItem.java
@@ -18,7 +18,7 @@ public class UploadItem {
   private final String mimeType;
   private ImageCoordinates gpsCoords;
   private List<UploadMediaDetail> uploadMediaDetails;
-  private final Place place;
+  private Place place;
   private final long createdTimestamp;
   private final String createdTimestampSource;
   private final BehaviorSubject<Integer> imageQuality;
@@ -70,6 +70,14 @@ public class UploadItem {
     this.imageQuality.onNext(imageQuality);
   }
 
+  /**
+   * Sets the corresponding place to the uploadItem
+   * @param place geolocated Wikidata item
+   */
+  public void setPlace(Place place) {
+    this.place = place;
+  }
+
   public Place getPlace() {
     return place;
   }
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.java
index 2721a0c26..4d9b4b417 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaPresenter.java
@@ -92,7 +92,7 @@ public class UploadMediaPresenter implements UserActionListener, SimilarImageInt
                           gpsCoords != null && gpsCoords.getImageCoordsExists();
                         view.showMapWithImageCoordinates(hasImageCoordinates);
                         view.showProgress(false);
-                        if (hasImageCoordinates) {
+                        if (hasImageCoordinates && place == null) {
                             checkNearbyPlaces(uploadItem);
                         }
                     },
@@ -194,6 +194,9 @@ public class UploadMediaPresenter implements UserActionListener, SimilarImageInt
     final List<UploadMediaDetail> uploadMediaDetails = repository.getUploads()
         .get(uploadItemPosition)
         .getUploadMediaDetails();
+    UploadItem uploadItem = repository.getUploads()
+        .get(uploadItemPosition);
+    uploadItem.setPlace(place);
     uploadMediaDetails.set(0, new UploadMediaDetail(place));
     view.updateMediaDetails(uploadMediaDetails);
   }