diff --git a/src/handlers/misc/USER_UPDATE.ts b/src/handlers/misc/USER_UPDATE.ts
index 9c85b8759..19c29bab7 100644
--- a/src/handlers/misc/USER_UPDATE.ts
+++ b/src/handlers/misc/USER_UPDATE.ts
@@ -15,7 +15,7 @@ export async function handleUserUpdate(data: DiscordGatewayPayload) {
   // Update username
   member.username = userData.username;
   // Update discriminator
-  member.discriminator = BigInt(userData.discriminator);
+  member.discriminator = Number(userData.discriminator);
 
   // Check if a avatar is available
   const hash = userData.avatar ? iconHashToBigInt(userData.avatar) : undefined;
diff --git a/src/helpers/members/avatar_url.ts b/src/helpers/members/avatar_url.ts
index a49e4a1ad..c6c950cdc 100644
--- a/src/helpers/members/avatar_url.ts
+++ b/src/helpers/members/avatar_url.ts
@@ -7,7 +7,7 @@ import { formatImageURL } from "../../util/utils.ts";
 /** The users custom avatar or the default avatar if you don't have a member object. */
 export function avatarURL(
   userId: bigint,
-  discriminator: bigint,
+  discriminator: number,
   options: {
     avatar?: string | bigint;
     size?: DiscordImageSize;
diff --git a/src/structures/member.ts b/src/structures/member.ts
index d83f6ca4f..7166f34ea 100644
--- a/src/structures/member.ts
+++ b/src/structures/member.ts
@@ -20,7 +20,7 @@ import { iconBigintToHash, iconHashToBigInt } from "../util/hash.ts";
 import { createNewProp } from "../util/utils.ts";
 import { DiscordenoGuild } from "./guild.ts";
 
-const MEMBER_SNOWFLAKES = ["id", "discriminator"];
+const MEMBER_SNOWFLAKES = ["id"];
 
 export const memberToggles = {
   /** Whether the user belongs to an OAuth2 application */
@@ -151,6 +151,12 @@ export async function createDiscordenoMember(
       const transformed = value ? iconHashToBigInt(value) : undefined;
       if (transformed?.animated) bitfield |= memberToggles.animatedAvatar;
       props.avatar = createNewProp(transformed?.bigint);
+      continue;
+    }
+
+    if (key === "discriminator") {
+      props.discriminator = createNewProp(Number(value));
+      continue;
     }
 
     props[key] = createNewProp(
@@ -190,7 +196,7 @@ export interface DiscordenoMember extends Omit<User, "discriminator" | "id" | "a
   /** The user's id */
   id: bigint;
   /** The user's 4-digit discord-tag */
-  discriminator: bigint;
+  discriminator: number;
   /** The avatar in bigint format. */
   avatar: bigint;
   /** The guild related data mapped by guild id */