Logout after timeout triggers disconnect on new session in EPP 5

Issue

If a user is logged in and the user clicks the logout button after the session has already expired a redirect to the login page happens. After valid credentials are entered the session is automatically closed as the query string for the logout (portal:componentId=UIPortal&portal:action=Logout) is evaluated at that point.

Is there a way to avoid that the user has to login again before the logout action gets executed?