diff --git a/src/diagnose.F90 b/src/diagnose.F90
index ae0ef8575e4b661a5ee4c4f11213a2f2ab75ca09..0a8f93a1768b9977f0966fff74f7a7e8af9778be 100644
--- a/src/diagnose.F90
+++ b/src/diagnose.F90
@@ -145,7 +145,7 @@ SUBROUTINE diagnose(kstep)
   !________________________________________________________________________________
   !                   2.   Periodic diagnostics
   !
-  IF (kstep .GT. 0) THEN
+  IF (kstep .GT. 0 .OR. kstep .EQ. 0) THEN
 
      !                       2.1   0d history arrays
      IF (nsave_0d .NE. 0) THEN