diff --git a/index.js b/index.js
index c6abfc4..e9677a0 100644
--- a/index.js
+++ b/index.js
@@ -82,6 +82,9 @@ export const startEvaluate = async ({
       return
     }
 
+    rounds.previous = rounds.current
+    rounds.current = new RoundData(roundIndex)
+
     // TODO: Fix this properly and implement a signalling mechanism allowing the "preprocess" step
     // to notify the "evaluate" when the preprocessing is done, so that we don't have to use a timer
     // here. See also https://github.com/filecoin-station/spark-evaluate/issues/64
@@ -89,9 +92,6 @@ export const startEvaluate = async ({
     await timers.setTimeout(EVALUATE_DELAY)
     console.log(`Now evaluating the round ${roundIndex}`)
 
-    rounds.previous = rounds.current
-    rounds.current = new RoundData(roundIndex)
-
     // Evaluate previous round
     evaluate({
       round: rounds.previous,