diff --git a/forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java b/forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java
index 5974e3e6637..e32de189652 100644
--- a/forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java
+++ b/forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java
@@ -47,7 +47,12 @@ public class GameStateEvaluator {
     }
 
     private Score getScoreForGameOver(Game game, Player aiPlayer) {
-        return game.getOutcome().getWinningTeam() == aiPlayer.getTeam() ? new Score(Integer.MAX_VALUE) : new Score(Integer.MIN_VALUE);
+        if (game.getOutcome().getWinningTeam() == aiPlayer.getTeam() ||
+                game.getOutcome().isWinner(aiPlayer.getRegisteredPlayer())) {
+            return new Score(Integer.MAX_VALUE);
+        }
+
+        return new Score(Integer.MIN_VALUE);
     }
     
     public Score getScoreForGameState(Game game, Player aiPlayer) {
diff --git a/forge-game/src/main/java/forge/game/GameOutcome.java b/forge-game/src/main/java/forge/game/GameOutcome.java
index 58e670e4ed4..51234bd414f 100644
--- a/forge-game/src/main/java/forge/game/GameOutcome.java
+++ b/forge-game/src/main/java/forge/game/GameOutcome.java
@@ -92,8 +92,8 @@ public final class GameOutcome implements Iterable<Entry<RegisteredPlayer, Playe
             this.playerRating.put(p.getRegisteredPlayer(), p.getStats());
             this.playerNames.put(p.getRegisteredPlayer(), p.getName());
 
-            if (p.getOutcome().hasWon() &&
-                    (winCondition == GameEndReason.AllOpponentsLost || winCondition == GameEndReason.AllOpposingTeamsLost)) {
+            if (p.getOutcome().hasWon() && winCondition == GameEndReason.AllOpposingTeamsLost) {
+                // Only mark the WinningTeam when "Team mode" is on.
                 winningTeam = p.getTeam();
             }
         }