diff --git a/ebos/eclproblem.hh b/ebos/eclproblem.hh
index 6654e19d2..b8644136b 100644
--- a/ebos/eclproblem.hh
+++ b/ebos/eclproblem.hh
@@ -737,7 +737,9 @@ public:
         OPM_TIMEBLOCK(problemWriteOutput);
         // use the generic code to prepare the output fields and to
         // write the desired VTK files.
-        ParentType::writeOutput(verbose);
+        if (EWOMS_GET_PARAM(TypeTag, bool, EnableWriteAllSolutions) || this->simulator().episodeWillBeOver()){
+            ParentType::writeOutput(verbose);
+        }
 
         bool isSubStep = !EWOMS_GET_PARAM(TypeTag, bool, EnableWriteAllSolutions) && !this->simulator().episodeWillBeOver();