[#53272017] Make sure we always have recorded headers