diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt
index 4c48b8261..2b95bfbe1 100644
--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt
@@ -233,21 +233,6 @@ class ImageFragment :
             onChangeSwitchState(isChecked)
             _switchState.value = isChecked
         }
-
-        viewLifecycleOwner.lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.STARTED) {
-                combine(
-                    imageAdapter.currentImagesCount,
-                    switchState
-                ) { imageCount, isChecked ->
-                    imageCount to isChecked
-                }.collect { (imageCount, isChecked) ->
-                    binding?.allImagesUploadedOrMarked?.isVisible =
-                        !isChecked && imageCount == 0 && (switch?.isVisible == true)
-                }
-            }
-        }
-
         selectorRV = binding?.selectorRv
         loader = binding?.loader
         progressLayout = binding?.progressLayout
@@ -267,6 +252,23 @@ class ImageFragment :
         return binding?.root
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        viewLifecycleOwner.lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                combine(
+                    imageAdapter.currentImagesCount,
+                    switchState
+                ) { imageCount, isChecked ->
+                    imageCount to isChecked
+                }.collect { (imageCount, isChecked) ->
+                    binding?.allImagesUploadedOrMarked?.isVisible =
+                        !isChecked && imageCount == 0 && (switch?.isVisible == true)
+                }
+            }
+        }
+    }
+
     private fun onChangeSwitchState(checked: Boolean) {
         if (checked) {
             showAlreadyActionedImages = true