diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index 00cf9832c8f..99c2ca3e6ae 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -2506,7 +2506,7 @@ public function userSeesTheFollowingSystemMessagesInRoom($user, $identifier, $st
 			$data = [
 				'room' => self::$tokenToIdentifier[$message['token']],
 				'actorType' => (string) $message['actorType'],
-				'actorId' => ($message['actorType'] === 'guests') ? self::$sessionIdToUser[$message['actorId']] : (string) $message['actorId'],
+				'actorId' => ($message['actorType'] === 'guests' && $message['actorId'] !== 'system') ? self::$sessionIdToUser[$message['actorId']] : (string) $message['actorId'],
 				'systemMessage' => (string) $message['systemMessage'],
 			];