diff --git a/apps/dav/lib/Connector/Sabre/BearerAuth.php b/apps/dav/lib/Connector/Sabre/BearerAuth.php
index e189d8fa12868..e893b97d5be46 100644
--- a/apps/dav/lib/Connector/Sabre/BearerAuth.php
+++ b/apps/dav/lib/Connector/Sabre/BearerAuth.php
@@ -3,6 +3,7 @@
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCA\DAV\Connector\Sabre;
 
 use OCP\AppFramework\Http;
@@ -40,10 +41,7 @@ private function setupUserFs($userId) {
 	public function validateBearerToken($bearerToken) {
 		\OC_Util::setupFS();
 
-		if (!$this->userSession->isLoggedIn()) {
-			$this->userSession->tryTokenLogin($this->request);
-		}
-		if ($this->userSession->isLoggedIn()) {
+		if ($this->userSession->tryTokenLogin($this->request)) {
 			return $this->setupUserFs($this->userSession->getUser()->getUID());
 		}
 
diff --git a/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php b/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php
index 99c2a461557ed..f7c28ca3ce26c 100644
--- a/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php
+++ b/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php
@@ -3,6 +3,7 @@
  * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCA\DAV\Tests\unit\Connector\Sabre;
 
 use OC\User\Session;
@@ -54,12 +55,9 @@ public function testValidateBearerTokenNotLoggedIn(): void {
 
 	public function testValidateBearerToken(): void {
 		$this->userSession
-			->expects($this->exactly(2))
-			->method('isLoggedIn')
-			->willReturnOnConsecutiveCalls(
-				false,
-				true,
-			);
+			->expects($this->once())
+			->method('tryTokenLogin')
+			->willReturn(true);
 		$user = $this->createMock(IUser::class);
 		$user
 			->expects($this->once())