diff --git a/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/simulation/CheckpointSimulationFacade.java b/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/simulation/CheckpointSimulationFacade.java
index df66f6a55e..ba325f9176 100644
--- a/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/simulation/CheckpointSimulationFacade.java
+++ b/scheduler-driver/src/main/java/gov/nasa/jpl/aerie/scheduler/simulation/CheckpointSimulationFacade.java
@@ -334,7 +334,10 @@ public SimulationData simulateWithResults(
 
   @Override
   public Optional<SimulationData> getLatestSimulationData() {
-    return Optional.ofNullable(this.latestSimulationData);
+    if (this.latestSimulationData == null)
+      return Optional.ofNullable(this.initialSimulationResults);
+    else
+      return Optional.ofNullable(this.latestSimulationData);
   }
 
 }