Multiple footers written to file on system restart

I created a custom layout that appends a header and footer to a rolling file appender with a time based and startup trigger policies which works great during normal circumstances except when it comes to system restarts. On shutdown the file is closed with the footer being written to the file, then on startup the startup trigger policy will open the file then immediately roll thus printing the footer again on rollover (prior to v2.4 the header was also written on startup LOG4J2-1030). I am attempting to produce well-formed XML with this particular use-case but it is getting mangled at this particular point. Ideally we can either have the footer either not print the second time or just perform the rollover on shutdown.