diff --git a/src/app.py b/src/app.py
index 4dcc6d4..029ce04 100644
--- a/src/app.py
+++ b/src/app.py
@@ -290,8 +290,16 @@ def get_avatar(package_id, user_id):
         if not user:
             return make_response('', 500)
         
-        avatar_extension = 'avatar' in user and user['avatar'].startswith('a_') and 'gif' or 'webp'
-        avatar_url = 'avatar' in user and f'https://cdn.discordapp.com/avatars/{user_id}/{user["avatar"]}.{avatar_extension}' or None
+        avatar_extension = 'avatar' in user and user['avatar'] is not None and user['avatar'].startswith('a_') and 'gif' or 'webp'
+
+        if 'discriminator' in user and user['discriminator'] != '0':
+            discriminator = int(user['discriminator'])
+            default_avatar = f'https://cdn.discordapp.com/embed/avatars/{discriminator % 4}.png'
+        else:
+            user_id = int(user['id'])
+            default_avatar = f'https://cdn.discordapp.com/embed/avatars/{(user_id >> 22) % 6}.png'
+
+        avatar_url = 'avatar' in user and user['avatar'] is not None and f'https://cdn.discordapp.com/avatars/{user_id}/{user["avatar"]}.{avatar_extension}' or default_avatar
 
         return jsonify({
             'user_id': user_id,