diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index e75152f5496..37a0ccd8734 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -228,6 +228,7 @@ public function index(string $token = '', string $callUser = '', string $passwor
 					$passwordVerification = $room->verifyPassword($password);
 
 					if ($passwordVerification['result']) {
+						$this->talkSession->renewSessionId();
 						$this->talkSession->setPasswordForRoom($token, $password);
 					} else {
 						$this->talkSession->removePasswordForRoom($token);
@@ -292,6 +293,7 @@ protected function guestEnterRoom(string $token, string $password): Response {
 
 			$passwordVerification = $room->verifyPassword($password);
 			if ($passwordVerification['result']) {
+				$this->talkSession->renewSessionId();
 				$this->talkSession->setPasswordForRoom($token, $password);
 			} else {
 				$this->talkSession->removePasswordForRoom($token);
diff --git a/lib/TalkSession.php b/lib/TalkSession.php
index 667001a2ef8..44ef46c9832 100644
--- a/lib/TalkSession.php
+++ b/lib/TalkSession.php
@@ -132,4 +132,8 @@ protected function removeValue(string $key, string $token): void {
 
 		$this->session->set($key, json_encode($values));
 	}
+
+	public function renewSessionId() {
+		$this->session->regenerateId();
+	}
 }