diff --git a/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModel.kt b/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModel.kt
index d6b4e1f9a4..e6a8968950 100644
--- a/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModel.kt
+++ b/app/src/main/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModel.kt
@@ -67,11 +67,9 @@ class PhotoTaskViewModel @Inject constructor(private val userMediaRepository: Us
 
   fun onCaptureResult(result: Boolean) {
     if (result && capturedUri != null) {
-      viewModelScope.launch {
-        savePhotoTaskData(capturedUri!!)
-        hasLaunchedCamera = false
-      }
+      viewModelScope.launch { savePhotoTaskData(capturedUri!!) }
     }
+    hasLaunchedCamera = false
   }
 
   /**
diff --git a/app/src/test/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModelTest.kt b/app/src/test/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModelTest.kt
index 291497a37b..c6723c348a 100644
--- a/app/src/test/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModelTest.kt
+++ b/app/src/test/java/org/groundplatform/android/ui/datacollection/tasks/photo/PhotoTaskViewModelTest.kt
@@ -96,6 +96,7 @@ class PhotoTaskViewModelTest : BaseHiltTest() {
     viewModel.onCaptureResult(false)
 
     verify(userMediaRepository, org.mockito.kotlin.never()).savePhotoFromUri(any(), any())
+    assertThat(viewModel.hasLaunchedCamera).isFalse()
   }
 
   @Test
@@ -105,6 +106,7 @@ class PhotoTaskViewModelTest : BaseHiltTest() {
     viewModel.onCaptureResult(true)
 
     verify(userMediaRepository, org.mockito.kotlin.never()).savePhotoFromUri(any(), any())
+    assertThat(viewModel.hasLaunchedCamera).isFalse()
   }
 
   companion object {