There’s a feature suggestion to address this behavior.
I only got a few episodes where I had to deal with that. With those I’ve kind of bypassed the issue by splitting the files or simply leaving a gap (manually twisting the metadata to make it clear that file covers the “gap”).