diff --git a/app/org/maproulette/controllers/api/ChallengeController.scala b/app/org/maproulette/controllers/api/ChallengeController.scala
index 2c04c9acc..632be3a36 100644
--- a/app/org/maproulette/controllers/api/ChallengeController.scala
+++ b/app/org/maproulette/controllers/api/ChallengeController.scala
@@ -578,7 +578,15 @@ class ChallengeController @Inject() (
               try {
                 this.dal.deleteTasks(user, challengeId, Utils.split(statusFilters).map(_.toInt))
               } finally {
-                dalManager.challenge.update(Json.obj("status" -> originalStatus), user)(challengeId)
+                // Check if original status is defined before reverting
+                originalStatus match {
+                  case Some(status) =>
+                    dalManager.challenge.update(Json.obj("status" -> status), user)(challengeId)
+                  case None =>
+                    throw new InvalidException(
+                      "Original status is not defined, cannot revert status."
+                    )
+                }
               }
             }
             Ok