diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt
index c2bed5fff..f3d786ebe 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt
@@ -508,24 +508,17 @@ class UploadActivity : BaseActivity(), UploadContract.View, UploadBaseFragment.C
                 fragments = mutableListOf()
             }
 
-
             for (uploadableFile in uploadableFiles) {
                 val uploadMediaDetailFragment = UploadMediaDetailFragment()
 
-                if (!uploadIsOfAPlace) {
+                // set fragment properties but defer initialization
+                uploadMediaDetailFragment.uploadableFile = uploadableFile
+                uploadMediaDetailFragment.place = place
+                uploadMediaDetailFragment.inAppPictureLocation = if (!uploadIsOfAPlace) {
                     handleLocation()
-                    uploadMediaDetailFragment.setImageToBeUploaded(
-                        uploadableFile,
-                        place,
-                        currLocation
-                    )
-                    locationManager!!.unregisterLocationManager()
+                    currLocation
                 } else {
-                    uploadMediaDetailFragment.setImageToBeUploaded(
-                        uploadableFile,
-                        place,
-                        currLocation
-                    )
+                    currLocation
                 }
 
                 val uploadMediaDetailFragmentCallback: UploadMediaDetailFragmentCallback =
@@ -580,12 +573,18 @@ class UploadActivity : BaseActivity(), UploadContract.View, UploadBaseFragment.C
                 if (isFragmentsSaved) {
                     val fragment = fragments!![0] as UploadMediaDetailFragment?
                     fragment!!.fragmentCallback = uploadMediaDetailFragmentCallback
+                    fragment.initializeFragment()
                 } else {
                     uploadMediaDetailFragment.fragmentCallback = uploadMediaDetailFragmentCallback
                     fragments!!.add(uploadMediaDetailFragment)
                 }
             }
 
+            // unregisteer location manager after loop if needed
+            if (!uploadIsOfAPlace) {
+                locationManager!!.unregisterLocationManager()
+            }
+
             //If fragments are not created, create them and add them to the fragments ArrayList
             if (!isFragmentsSaved) {
                 uploadCategoriesFragment = UploadCategoriesFragment()