diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index 5a9b27d3..f72ac931 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -1675,7 +1675,11 @@ void Human::SendGameOver()
                 abort();
             }
 #endif
-            SendMsgSelfAndOb(msg);
+            if (room->IsGameOver()) {
+                SendMsgSelfAndOb(msg);
+            } else {
+                SendNotifyMsg(msg);
+            }
 #ifdef MYDEBUG
             if (IsPlayer()) {
                 a8::XPrintf("SMGameOver:%s\n", {f8::PbToJson(&msg)});
@@ -1687,7 +1691,7 @@ void Human::SendGameOver()
                 SendPersonalBattleReport();
                 sent_personal_report_ = true;
             }
-            if (GetTeam()->team_rank && GetTeam()->HasPlayer()) {
+            if (GetTeam()->team_rank && GetTeam()->HasPlayer() && !GetTeam()->IsViewTeam()) {
                 if (!GetTeam()->sending_battlereport) {
                     GetTeam()->sending_battlereport = true;
                     GetTeam()->SendTeamBattleReport(this);
@@ -1700,7 +1704,11 @@ void Human::SendGameOver()
                     abort();
                 }
 #endif
-                SendMsgSelfAndOb(msg);
+                if (room->IsGameOver()) {
+                    SendMsgSelfAndOb(msg);
+                } else {
+                    SendNotifyMsg(msg);
+                }
 #ifdef MYDEBUG
                 if (IsPlayer()) {
                     a8::XPrintf("SMGameOver:%s\n", {f8::PbToJson(&msg)});