diff --git a/core/Controller/ClientFlowLoginController.php b/core/Controller/ClientFlowLoginController.php
index c3b88f752d..088a6a9869 100644
--- a/core/Controller/ClientFlowLoginController.php
+++ b/core/Controller/ClientFlowLoginController.php
@@ -366,10 +366,10 @@ class ClientFlowLoginController extends Controller {
 
 			$serverPath = $protocol . "://" . $this->request->getServerHost() . $serverPostfix;
 			$redirectUri = 'nc://login/server:' . $serverPath . '&user:' . urlencode($loginName) . '&password:' . urlencode($token);
-		}
 
-		// Clear the token from the login here
-		$this->tokenProvider->invalidateToken($sessionId);
+			// Clear the token from the login here
+			$this->tokenProvider->invalidateToken($sessionId);
+		}
 
 		return new Http\RedirectResponse($redirectUri);
 	}