diff --git a/.gitignore b/.gitignore
index 7cc0be609..f2f2fc868 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ Win32/
 x64/
 
 .idea
+.vscode
 
 # LaTeX/PDF produciton byproducts
 *.aux
diff --git a/src/fileappender.cxx b/src/fileappender.cxx
index 11ff00479..212e3cab2 100644
--- a/src/fileappender.cxx
+++ b/src/fileappender.cxx
@@ -1289,10 +1289,14 @@ TimeBasedRollingFileAppender::init()
     Time now = Time::gettimeofday();
     nextRolloverTime = calculateNextRolloverTime(now);
 
-    if (cleanHistoryOnStart)
+    if (LOG4CPLUS_UNLIKELY(cleanHistoryOnStart))
     {
         clean(now + Time(maxHistory*getRolloverPeriodDuration()));
     }
+    else
+    {
+        clean(now);
+    }
 
     lastHeartBeat = now;
 }