diff --git a/src/structures/ClientUser.js b/src/structures/ClientUser.js
index 95d254054..beb624623 100644
--- a/src/structures/ClientUser.js
+++ b/src/structures/ClientUser.js
@@ -82,7 +82,8 @@ class ClientUser extends User {
   edit(data, password) {
     const _data = {};
     _data.username = data.username || this.username;
-    _data.avatar = this.client.resolver.resolveBase64(data.avatar) || this.avatar;
+    _data.avatar = this.client.resolver.resolveBase64(data.avatar);
+
     if (!this.bot) {
       _data.email = data.email || this.email;
       _data.password = password;
@@ -156,7 +157,7 @@ class ClientUser extends User {
     if (typeof avatar === 'string' && avatar.startsWith('data:')) {
       return this.edit({ avatar });
     } else {
-      return this.client.resolver.resolveBuffer(avatar)
+      return this.client.resolver.resolveBuffer(avatar || Buffer.alloc(0))
         .then(data => this.edit({ avatar: this.client.resolver.resolveBase64(data) || null }));
     }
   }