diff --git a/lib/private/Authentication/LoginCredentials/Store.php b/lib/private/Authentication/LoginCredentials/Store.php
index ea4c9fdd0c..17749c63b3 100644
--- a/lib/private/Authentication/LoginCredentials/Store.php
+++ b/lib/private/Authentication/LoginCredentials/Store.php
@@ -56,6 +56,15 @@ class Store implements IStore {
 		$this->logger = $logger;
 	}
 
+	/**
+	 * Replace the session implementation
+	 *
+	 * @param ISession $session
+	 */
+	public function setSession(ISession $session) {
+		$this->session = $session;
+	}
+
 	/**
 	 * @since 9.2
 	 *
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 7c2d00e283..45ed9d5e3b 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -1004,7 +1004,8 @@ class Server extends ServerContainer implements IServerContainer {
 	 */
 	public function setSession(\OCP\ISession $session) {
 		$this->query(SessionStorage::class)->setSession($session);
-		return $this->query('UserSession')->setSession($session);
+		$this->query('UserSession')->setSession($session);
+		$this->query(Store::class)->setSession($session);
 	}
 
 	/**