diff --git a/trickortreat/trickortreat.py b/trickortreat/trickortreat.py
index aca302a..26fb830 100644
--- a/trickortreat/trickortreat.py
+++ b/trickortreat/trickortreat.py
@@ -264,7 +264,9 @@ class TrickOrTreat(BaseCog):
         guild_users = [m.id for m in ctx.guild.members if m is not m.bot and not m == ctx.author]
         candy_users = await self.config._all_from_scope(scope="USER")
         valid_user = list(set(guild_users) & set(candy_users))
-        if user == ctx.author or user == user.bot:
+        if not user:
+            picked_user = self.bot.get_user(random.choice(valid_user))
+        elif user == ctx.author or user == user.bot:
             picked_user = self.bot.get_user(random.choice(valid_user))
         elif user:
             picked_user = user