diff --git a/ProjectLighthouse/Types/User.cs b/ProjectLighthouse/Types/User.cs
index e47b45a4..4ffcca3d 100644
--- a/ProjectLighthouse/Types/User.cs
+++ b/ProjectLighthouse/Types/User.cs
@@ -30,7 +30,7 @@ public class User
         get {
             string avatarHash = this.IconHash;
 
-            if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = this.YayHash;
+            if (string.IsNullOrWhiteSpace(avatarHash) || this.IconHash.StartsWith('g')) avatarHash = this.YayHash;
             if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = this.MehHash;
             if (string.IsNullOrWhiteSpace(avatarHash)) avatarHash = this.BooHash;