diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
index 055f63c7dd..8881151e18 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
@@ -341,6 +341,7 @@ public int getTotalNumberOfSteps() {
             fragments.add(mediaLicenseFragment);
 
             uploadImagesAdapter.setFragments(fragments);
+            vpUpload.setOffscreenPageLimit(fragments.size());
         }
     }
 
@@ -430,8 +431,6 @@ public void setFragments(List<Fragment> fragments) {
         }
 
         @Override public int getCount() {
-            //I understand this is not the best way, I will think of something better than this
-            vpUpload.setOffscreenPageLimit(fragments.size());
             return fragments.size();
         }