diff --git a/source/solvers/navier_stokes_base.cc b/source/solvers/navier_stokes_base.cc
index c942c6025a..895fd5e0fe 100644
--- a/source/solvers/navier_stokes_base.cc
+++ b/source/solvers/navier_stokes_base.cc
@@ -530,9 +530,10 @@ NavierStokesBase<dim, VectorType, DofsType>::finish_time_step()
     }
   if (this->simulation_parameters.restart_parameters.checkpoint &&
       simulation_control->get_step_number() != 0 &&
-      simulation_control->get_step_number() %
-          this->simulation_parameters.restart_parameters.frequency ==
-        0)
+      (simulation_control->get_step_number() %
+           this->simulation_parameters.restart_parameters.frequency ==
+         0 ||
+       simulation_control->is_at_end()))
     {
       this->write_checkpoint();
     }