diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4215a253b61..4221147c9f18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [2.8.8] - 2021-10-13
+
+### Fixed
+
+- Reverts the change in 2.8.7, #1069, as this caused bad History behavior (see #1074)
+
 ## [2.8.7] - 2021-10-12
 
 ### Fixed
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96979e5d7044..74cf0a481a96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   MAPL
-  VERSION 2.8.7
+  VERSION 2.8.8
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # Set the default build type to release
diff --git a/gridcomps/History/MAPL_HistoryGridComp.F90 b/gridcomps/History/MAPL_HistoryGridComp.F90
index 2b599f0316f3..5fe808d2e47a 100644
--- a/gridcomps/History/MAPL_HistoryGridComp.F90
+++ b/gridcomps/History/MAPL_HistoryGridComp.F90
@@ -3460,6 +3460,13 @@ subroutine Run ( gc, import, export, clock, rc )
           _VERIFY(STATUS)
        endif
 
+       if( NewSeg .and. list(n)%unit /= 0 .and. list(n)%duration /= 0 ) then
+          if (list(n)%unit > 0 ) then
+             call FREE_FILE( list(n)%unit )
+          end if
+          list(n)%unit = 0
+       endif
+
    end do
 
    if(any(Writing)) call WRITE_PARALLEL("")
@@ -3640,13 +3647,6 @@ subroutine Run ( gc, import, export, clock, rc )
 
       endif OUTTIME
 
-      if( NewSeg .and. list(n)%unit /= 0 .and. list(n)%duration /= 0 ) then
-         if (list(n)%unit > 0 ) then
-            call FREE_FILE( list(n)%unit )
-         end if
-         list(n)%unit = 0
-       endif
-
    enddo POSTLOOP
 
    if (any(writing)) then