diff --git a/webapp/controller/MatchController.class.php b/webapp/controller/MatchController.class.php
index 2d3eea86..0891c8a9 100644
--- a/webapp/controller/MatchController.class.php
+++ b/webapp/controller/MatchController.class.php
@@ -55,6 +55,7 @@ class MatchController extends BaseAuthedController {
                 if ($currMatchDb['current_team'] != $teamUuid) {
                     $this->matchOk($r, $teamUuid, $currMatchDb);
                     $this->fillMatchInfo($r, $teamUuid, $matchInfo, $this->readMatchOk($r, $teamUuid));
+                } else {
                 }
             }
         }
@@ -160,7 +161,9 @@ class MatchController extends BaseAuthedController {
         }
         {
             $teamDb = $this->readTeamDb($r, $matchOkDb['target_team']);
-            array_push($matchInfo['team_list'], $teamDb);
+            if (!empty($teamDb) && $teamDb['team_uuid'] != $teamUuid) {
+                array_push($matchInfo['team_list'], $teamDb);
+            }
         }
     }