diff --git a/src/client.js b/src/client.js
index 197ddb1e6..5c72be517 100644
--- a/src/client.js
+++ b/src/client.js
@@ -3709,7 +3709,7 @@ MatrixClient.prototype.setDisplayName = async function(name, callback) {
     const user = this.getUser(this.getUserId());
     if (user) {
         user.displayName = name;
-        user.emit("User.displayName", null, user);
+        user.emit("User.displayName", user.events.presence, user);
     }
     return prom;
 };
@@ -3727,7 +3727,7 @@ MatrixClient.prototype.setAvatarUrl = async function(url, callback) {
     const user = this.getUser(this.getUserId());
     if (user) {
         user.avatarUrl = url;
-        user.emit("User.avatarUrl", null, user);
+        user.emit("User.avatarUrl", user.events.presence, user);
     }
     return prom;
 };