diff --git a/ewoms/common/simulator.hh b/ewoms/common/simulator.hh
index 649111fce9..9bd3d9db3e 100644
--- a/ewoms/common/simulator.hh
+++ b/ewoms/common/simulator.hh
@@ -636,7 +636,7 @@ public:
 
             // write initial condition
             if (problem_->shouldWriteOutput())
-                EWOMS_CATCH_PARALLEL_EXCEPTIONS_FATAL(problem_->writeOutput(/*isSubstep=*/false));
+                EWOMS_CATCH_PARALLEL_EXCEPTIONS_FATAL(problem_->writeOutput(/*isSubstep=*/!episodeWillBeOver()));
 
             timeStepSize_ = oldTimeStepSize;
             timeStepIdx_ = oldTimeStepIdx;