PLAT-6795 - Fix application of EOM flag when not at EOM

Fixup PR