diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 7073584a66..097a770831 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -175,7 +175,10 @@ class LoginController extends Controller {
 		);
 
 		if (!empty($redirect_url)) {
-			$this->initialStateService->provideInitialState('core', 'loginRedirectUrl', $redirect_url);
+			[$url, ] = explode('?', $redirect_url);
+			if ($url !== $this->urlGenerator->linkToRoute('core.login.logout')) {
+				$this->initialStateService->provideInitialState('core', 'loginRedirectUrl', $redirect_url);
+			}
 		}
 
 		$this->initialStateService->provideInitialState(