diff --git a/src/pluralkit/bot/commands/member_commands.py b/src/pluralkit/bot/commands/member_commands.py
index 5f1f7a23..5d335e4a 100644
--- a/src/pluralkit/bot/commands/member_commands.py
+++ b/src/pluralkit/bot/commands/member_commands.py
@@ -128,6 +128,9 @@ async def member_avatar(ctx: CommandContext, member: Member):
         user = await utils.parse_mention(ctx.client, new_avatar_url)
         if user:
             new_avatar_url = user.avatar_url_as(format="png")
+    
+    if not new_avatar_url and ctx.message.attachments[0]:
+        new_avatar_url = ctx.message.attachments[0].url
 
     await member.set_avatar(ctx.conn, new_avatar_url)
     await ctx.reply_ok("Member avatar {}.".format("updated" if new_avatar_url else "cleared"))
diff --git a/src/pluralkit/bot/commands/system_commands.py b/src/pluralkit/bot/commands/system_commands.py
index 0e50d754..be60d862 100644
--- a/src/pluralkit/bot/commands/system_commands.py
+++ b/src/pluralkit/bot/commands/system_commands.py
@@ -184,6 +184,9 @@ async def system_avatar(ctx: CommandContext):
         user = await utils.parse_mention(ctx.client, new_avatar_url)
         if user:
             new_avatar_url = user.avatar_url_as(format="png")
+    
+    if not new_avatar_url and ctx.message.attachments[0]:
+        new_avatar_url = ctx.message.attachments[0].url
 
     await system.set_avatar(ctx.conn, new_avatar_url)
     await ctx.reply_ok("System avatar {}.".format("updated" if new_avatar_url else "cleared"))