What do you do about baby waking up from rolling onto tummy during naps?

Our LO is 6 months in 1 week and has been ST extinction method since about 4.5 months. She sleeps well at night and naps with minimal to no crying. However the past week she's learned to roll back to tummy and will do it in her sleep then wake up once she is on her tummy. Night time is fine as she'll fuss then go back to sleep once we roll her onto her back. However for naps it's a different story. She will roll onto her tummy then wake up and cry. She'll cry if we leave her in tummy time and if we roll her onto her back she'll still cry or roll back onto her tummy. She can't seem to fall back asleep when this happens and her naps inevitably end at this point. Is there anything we can do to help her nap longer or is this just a phase we have to hope passes at some point?