diff --git a/src/main/java/io/blert/challenges/colosseum/ColosseumChallenge.java b/src/main/java/io/blert/challenges/colosseum/ColosseumChallenge.java
index 0148317..ea25d76 100644
--- a/src/main/java/io/blert/challenges/colosseum/ColosseumChallenge.java
+++ b/src/main/java/io/blert/challenges/colosseum/ColosseumChallenge.java
@@ -240,10 +240,10 @@ private void queueFinishColosseum(ChallengeState state) {
     private void finishColosseum(ChallengeState state) {
         log.debug("Ending Colosseum challenge: {}", state);
         stateChangeCooldown = false;
+        int reported = reportedChallengeTicks;
 
         cleanup();
-        dispatchEvent(new ChallengeEndEvent(reportedChallengeTicks, -1));
-
+        dispatchEvent(new ChallengeEndEvent(reported, -1));
         setState(state);
     }
 
diff --git a/src/main/java/io/blert/challenges/inferno/InfernoChallenge.java b/src/main/java/io/blert/challenges/inferno/InfernoChallenge.java
index bcac5b2..48e70d3 100644
--- a/src/main/java/io/blert/challenges/inferno/InfernoChallenge.java
+++ b/src/main/java/io/blert/challenges/inferno/InfernoChallenge.java
@@ -254,9 +254,9 @@ private void startInferno() {
 
     private void finishInferno(ChallengeState state) {
         log.info("Finishing Inferno challenge with state: {}", state);
+        int reported = reportedChallengeTicks;
         cleanup();
-
-        dispatchEvent(new ChallengeEndEvent(reportedChallengeTicks, reportedChallengeTicks));
+        dispatchEvent(new ChallengeEndEvent(reported, reported));
         setState(state);
     }
 
diff --git a/src/main/java/io/blert/challenges/mokhaiotl/MokhaiotlChallenge.java b/src/main/java/io/blert/challenges/mokhaiotl/MokhaiotlChallenge.java
index 1be0657..01c37db 100644
--- a/src/main/java/io/blert/challenges/mokhaiotl/MokhaiotlChallenge.java
+++ b/src/main/java/io/blert/challenges/mokhaiotl/MokhaiotlChallenge.java
@@ -160,9 +160,11 @@ private void startMokhaiotl() {
 
     private void finishMokhaiotl() {
         log.info("Finishing Mokhaiotl challenge with state: {}", getState());
-        cleanup();
 
-        dispatchEvent(new ChallengeEndEvent(reportedChallengeTicks, -1));
+        int reported = reportedChallengeTicks;
+
+        cleanup();
+        dispatchEvent(new ChallengeEndEvent(reported, -1));
         setState(ChallengeState.INACTIVE);
     }