diff --git a/discord/clantag.py b/discord/clantag.py
index e8805f3c3..be7e67a27 100644
--- a/discord/clantag.py
+++ b/discord/clantag.py
@@ -38,10 +38,10 @@ class ClanTag:
     __slots__ = ("identity_guild_id", "identity_enabled", "tag", "badge")
 
     def __init__(self, data: ClanTagPayload):
-        self.identity_guild_id: int = int(data["identity_guild_id"])
-        self.identity_enabled: bool = data["identity_enabled"]
-        self.tag: str = data["tag"]
-        self.badge: str = data["badge"]
+        self.identity_guild_id: int = int(data.get("identity_guild_id", 0))
+        self.identity_enabled: bool = data.get("identity_enabled", False)
+        self.tag: str = data.get("tag", "null")
+        self.badge: str = data.get("badge", "null")
 
     def __repr__(self) -> str:
         return f"<ClanTag tag={self.tag!r} identity_guild_id={self.identity_guild_id}>"
\ No newline at end of file
diff --git a/discord/user.py b/discord/user.py
index d3352ecf0..0affceddf 100644
--- a/discord/user.py
+++ b/discord/user.py
@@ -129,7 +129,8 @@ class BaseUser(_UserTag):
         self._avatar_decoration_data = data.get('avatar_decoration_data')
         
         clan_data = data.get("clan") or data.get("primary_guild")
-        self.clan_tag: Optional[ClanTag] = ClanTag(clan_data) if clan_data else None
+        if clan_data:
+            self.clan_tag: Optional[ClanTag] = ClanTag(clan_data)
 
 
     @classmethod