- Fix dangerous end portal logic (#5776)