diff --git a/gsmgogo-api/src/main/java/team/gsmgogo/domain/match/service/impl/MatchServiceImpl.java b/gsmgogo-api/src/main/java/team/gsmgogo/domain/match/service/impl/MatchServiceImpl.java
index bb487007..cc641c98 100644
--- a/gsmgogo-api/src/main/java/team/gsmgogo/domain/match/service/impl/MatchServiceImpl.java
+++ b/gsmgogo-api/src/main/java/team/gsmgogo/domain/match/service/impl/MatchServiceImpl.java
@@ -44,12 +44,12 @@ public MatchResponse execute(int month, int day) {
                 .matchId(match.getMatchId())
                 .matchType(match.getMatchType())
                 .matchLevel(match.getMatchLevel())
-                .teamAId(match.getTeamA().getTeamId())
-                .teamAName(match.getTeamA().getTeamName())
+                .teamAId(match.getTeamA() != null ? match.getTeamA().getTeamId() : null)
+                .teamAName(match.getTeamA() != null ? match.getTeamA().getTeamName() : null)
                 .teamAGrade(match.getTeamAGrade())
                 .teamAClassType(match.getTeamAClassType())
-                .teamBId(match.getTeamB().getTeamId())
-                .teamBName(match.getTeamB().getTeamName())
+                .teamBId(match.getTeamB() != null ? match.getTeamB().getTeamId() : null)
+                .teamBName(match.getTeamB() != null ? match.getTeamB().getTeamName() : null)
                 .teamBGrade(match.getTeamBGrade())
                 .teamBClassType(match.getTeamBClassType())
                 .badmintonRank(match.getTeamA().getBadmintonRank())