diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
index 94eb25e6d..d6b834944 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
@@ -257,10 +257,12 @@ public class ShareActivity
                 Timber.d("This was initiated by a direct upload from Nearby");
                 isNearbyUpload = true;
 
+                /**
                 SharedPreferences sharedPref = this.getSharedPreferences("Direct Upload", Context.MODE_PRIVATE);
                 nearbyTitle = sharedPref.getString("Title", "");
                 nearbyDesc = sharedPref.getString("Desc", "");
                 Timber.d("In ShareActivity, image title: " + nearbyTitle + " and image desc: " + nearbyDesc);
+                 */
             }
             mimeType = intent.getType();
         }
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
index 94658ea09..ffe61e5c0 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
@@ -56,6 +56,8 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment {
     @BindView(R.id.licenseSpinner) Spinner licenseSpinner;
 
     @Inject @Named("default_preferences") SharedPreferences prefs;
+    @Inject @Named("direct_nearby_upload_prefs") SharedPreferences directPrefs;
+
 
     private String license;
     private OnUploadActionInitiated uploadActionInitiatedHandler;
@@ -110,8 +112,8 @@ public class SingleUploadFragment extends CommonsDaggerSupportFragment {
         boolean isNearbyUpload = ((ShareActivity) getActivity()).isNearbyUpload();
 
         if (isNearbyUpload) {
-            String imageTitle = ((ShareActivity) getActivity()).getNearbyTitle();
-            String imageDesc = ((ShareActivity) getActivity()).getNearbyDesc();
+            String imageTitle = directPrefs.getString("Title", "");
+            String imageDesc = directPrefs.getString("Desc", "");
             titleEdit.setText(imageTitle);
             descEdit.setText(imageDesc);
         }