diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php
index a449b075..2fc87da6 100644
--- a/webapp/controller/MatchController.class.php
+++ b/webapp/controller/MatchController.class.php
@@ -237,12 +237,19 @@ class MatchController extends BaseAuthedController {
             $teamDb = $this->readTeamDb($r, $matchOkDb['target_team']);
             if (!empty($teamDb) && $teamDb['team_uuid'] != $teamUuid) {
                 array_push($matchInfo['team_list'], $teamDb);
+                $teamInfo = array(
+                    'team_uuid' => $teamDb['team_uuid'],
+                    'members' => array()
+                );
                 foreach ($teamDb['member_list'] as $val) {
                     array_push($teamInfo['members'], array(
                         'account_id' => $val['account_id']
                     ));
                 }
                 array_push($teamList, $teamInfo);
+                if (strcasecmp($teamDb['team_uuid'], $data['room_uuid']) < 0) {
+                    $data['room_uuid'] = $teamDb['team_uuid'];
+                }
             }
         }
         $data['team_list'] = $teamList;