diff --git a/lib/Service/UserScopeService.php b/lib/Service/UserScopeService.php
index 30824c9c8e..18eb6bf7ef 100644
--- a/lib/Service/UserScopeService.php
+++ b/lib/Service/UserScopeService.php
@@ -33,7 +33,12 @@ public function setUserScope(?string $uid = null): void {
 		if ($user === null) {
 			throw new InvalidArgumentException('No user found for the uid ' . $uid);
 		}
-		$this->userSession->setUser($user);
+
+		if (method_exists($this->userSession, 'setVolatileActiveUser')) {
+			$this->userSession->setVolatileActiveUser($user);
+		} else {
+			$this->userSession->setUser($user);
+		}
 	}
 
 	/**