diff --git a/src/structures/ClientUser.js b/src/structures/ClientUser.js
index bd54f2390..54925a5fb 100644
--- a/src/structures/ClientUser.js
+++ b/src/structures/ClientUser.js
@@ -184,10 +184,10 @@ class ClientUser extends User {
       if (data.game) {
         game = data.game;
         if (game.url) game.type = 1;
+      } else if (typeof data.game !== 'undefined') {
+        game = null;
       }
 
-      if (data.game === null) game = null;
-
       if (typeof data.afk !== 'undefined') afk = data.afk;
       afk = Boolean(afk);
 
@@ -231,7 +231,7 @@ class ClientUser extends User {
    * @returns {Promise<ClientUser>}
    */
   setGame(game, streamingURL) {
-    if (game === null) return this.setPresence({ game });
+    if (!game) return this.setPresence({ game: null });
     return this.setPresence({ game: {
       name: game,
       url: streamingURL,