diff --git a/forge-gui/src/main/java/forge/match/GameLobby.java b/forge-gui/src/main/java/forge/match/GameLobby.java
index b3e57a76450..9282a300c15 100644
--- a/forge-gui/src/main/java/forge/match/GameLobby.java
+++ b/forge-gui/src/main/java/forge/match/GameLobby.java
@@ -406,7 +406,7 @@ public abstract class GameLobby {
                 deck = deck == null ? rp.getDeck() : deck;
 
                 final CardPool avatarPool = deck.get(DeckSection.Avatar);
-                if (avatarPool != null) {
+                if (avatarPool != null && (hasVariant(GameType.Vanguard) || hasVariant(GameType.MomirBasic))) {
                     vanguardAvatar = avatarPool.get(0);
                 }