diff --git a/src/client/websocket/packets/handlers/PresenceUpdate.js b/src/client/websocket/packets/handlers/PresenceUpdate.js
index 09d78a01b..6e70639a8 100644
--- a/src/client/websocket/packets/handlers/PresenceUpdate.js
+++ b/src/client/websocket/packets/handlers/PresenceUpdate.js
@@ -36,6 +36,10 @@ class PresenceUpdateHandler extends AbstractHandler {
         client.emit(Constants.Events.GUILD_MEMBER_AVAILABLE, member);
       }
       if (member) {
+        if (client.listenerCount(Constants.Events.PRESENCE_UPDATE) === 0) {
+          guild._setPresence(user.id, data);
+          return;
+        }
         const oldMember = cloneObject(member);
         if (member.presence) {
           oldMember.frozenPresence = cloneObject(member.presence);
diff --git a/typings b/typings
index 14c4b674c..3dbeb51fd 160000
--- a/typings
+++ b/typings
@@ -1 +1 @@
-Subproject commit 14c4b674cfab537277e80ce57b8b68717e4055d1
+Subproject commit 3dbeb51fd2a0ec0ca87c4ddcf20c1c1498633762