diff --git a/frontend/src/ts/test/test-logic.ts b/frontend/src/ts/test/test-logic.ts
index 5a4191df4..e33bfc5ab 100644
--- a/frontend/src/ts/test/test-logic.ts
+++ b/frontend/src/ts/test/test-logic.ts
@@ -1152,12 +1152,6 @@ export async function finish(difficultyFailed = false): Promise<void> {
     dontSave,
   );
 
-  if (completedEvent.testDuration > 122) {
-    completedEvent.chartData = "toolong";
-    completedEvent.keySpacing = "toolong";
-    completedEvent.keyDuration = "toolong";
-  }
-
   if (dontSave) {
     void AnalyticsController.log("testCompletedInvalid");
     return;
@@ -1175,6 +1169,12 @@ export async function finish(difficultyFailed = false): Promise<void> {
 
   completedEvent.uid = user.uid;
 
+  if (completedEvent.testDuration > 122) {
+    completedEvent.chartData = "toolong";
+    completedEvent.keySpacing = "toolong";
+    completedEvent.keyDuration = "toolong";
+  }
+
   if (!completedEvent.bailedOut) {
     const challenge = ChallengeContoller.verify(completedEvent);
     if (challenge !== null) completedEvent.challenge = challenge;