diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java
index 1a0ad6961e7..11f62fbad9f 100644
--- a/forge-game/src/main/java/forge/game/player/Player.java
+++ b/forge-game/src/main/java/forge/game/player/Player.java
@@ -2212,12 +2212,16 @@ public class Player extends GameEntity implements Comparable<Player> {
         }
         controllerCreator = ctrlr;
         controller = ctrlr;
-        view.updateAvatarIndex(this);
-        view.updateAvatarCardImageKey(this);
+        updateAvatar();
         view.updateIsAI(this);
         view.updateLobbyPlayerName(this);
     }
 
+    public void updateAvatar() {
+        view.updateAvatarIndex(this);
+        view.updateAvatarCardImageKey(this);
+    }
+
     /**
      * Run a procedure using a different controller
      */
diff --git a/forge-gui-mobile/src/forge/screens/match/MatchController.java b/forge-gui-mobile/src/forge/screens/match/MatchController.java
index 28533e29725..b92e7929a06 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchController.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchController.java
@@ -7,8 +7,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
-
 import forge.Forge;
 import forge.Graphics;
 import forge.LobbyPlayer;
@@ -61,7 +61,7 @@ public class MatchController implements IMatchController {
         String lp = p.getLobbyPlayerName();
         FImage avatar = avatarImages.get(lp);
         if (avatar == null) {
-            if (p.getAvatarCardImageKey() == null) {
+            if (StringUtils.isEmpty(p.getAvatarCardImageKey())) {
                 avatar = new FTextureRegionImage(FSkin.getAvatars().get(p.getAvatarIndex()));
             }
             else { //handle lobby players with art from cards
diff --git a/forge-gui/src/main/java/forge/match/MatchUtil.java b/forge-gui/src/main/java/forge/match/MatchUtil.java
index 01152e435fb..9da5bffd756 100644
--- a/forge-gui/src/main/java/forge/match/MatchUtil.java
+++ b/forge-gui/src/main/java/forge/match/MatchUtil.java
@@ -147,6 +147,7 @@ public class MatchUtil {
                 i++;
             }
             p.getLobbyPlayer().setAvatarIndex(avatarIndex);
+            p.updateAvatar();
 
             if (p.getController() instanceof PlayerControllerHuman) {
                 final PlayerControllerHuman humanController = (PlayerControllerHuman) p.getController();