diff --git a/src/Discord.Net/Models/User.cs b/src/Discord.Net/Models/User.cs
index 8e2d1b4bc..c7744ef4c 100644
--- a/src/Discord.Net/Models/User.cs
+++ b/src/Discord.Net/Models/User.cs
@@ -239,7 +239,7 @@ namespace Discord
             if (Server == null) throw new InvalidOperationException("Unable to edit users in a private channel");
 
             //Modify the roles collection and filter out the everyone role
-            var roleIds = roles == null ? null : roles
+            var roleIds = (roles ?? Roles)
                 .Where(x => !x.IsEveryone)
                 .Select(x => x.Id)
                 .Distinct()