diff --git a/src/stores/ClientPresenceStore.js b/src/stores/ClientPresenceStore.js
index 537beee0d..f29b95096 100644
--- a/src/stores/ClientPresenceStore.js
+++ b/src/stores/ClientPresenceStore.js
@@ -2,6 +2,7 @@ const PresenceStore = require('./PresenceStore');
 const Collection = require('../util/Collection');
 const Constants = require('../util/Constants');
 const { Presence } = require('../structures/Presence');
+const { TypeError } = require('../errors');
 
 class ClientPresenceStore extends PresenceStore {
   constructor(...args) {
@@ -14,7 +15,9 @@ class ClientPresenceStore extends PresenceStore {
     });
   }
 
-  async setClientPresence({ status, since, afk, activity }) {
+  async setClientPresence({ status, since, afk, activity }) { // eslint-disable-line complexity
+    if (typeof activity.name !== 'string') throw new TypeError('INVALID_TYPE', 'name', 'string');
+    if (!activity.type) activity.type = 0;
     const applicationID = activity && (activity.application ? activity.application.id || activity.application : null);
     let assets = new Collection();
     if (activity && activity.assets && applicationID) {