diff --git a/src/pluralkit/bot/commands/member_commands.py b/src/pluralkit/bot/commands/member_commands.py
index a5d3afac..3252b39d 100644
--- a/src/pluralkit/bot/commands/member_commands.py
+++ b/src/pluralkit/bot/commands/member_commands.py
@@ -55,10 +55,13 @@ async def member_set(ctx: CommandContext):
help=help.edit_member)
if ctx.has_next():
- value = " ".join(ctx.remaining())
+ value = ctx.remaining()
# Sanity/validity checks and type conversions
if prop == "name":
+ if re.search("", value):
+ return CommandError("Due to a Discord limitation, custom emojis aren't supported. Please use a standard emoji instead.")
+
bounds_error = utils.bounds_check_member_name(value, system.tag)
if bounds_error:
return CommandError(bounds_error)
diff --git a/src/pluralkit/bot/commands/system_commands.py b/src/pluralkit/bot/commands/system_commands.py
index 914a2724..db39f5e9 100644
--- a/src/pluralkit/bot/commands/system_commands.py
+++ b/src/pluralkit/bot/commands/system_commands.py
@@ -67,6 +67,9 @@ async def system_set(ctx: CommandContext):
if len(value) > 32:
return CommandError("You can't have a system tag longer than 32 characters.")
+ if re.search("", value):
+ return CommandError("Due to a Discord limitation, custom emojis aren't supported. Please use a standard emoji instead.")
+
# Make sure there are no members which would make the combined length exceed 32
members_exceeding = await db.get_members_exceeding(ctx.conn, system_id=system.id,
length=32 - len(value) - 1)