diff --git a/lib/reducers/user-reducer.js b/lib/reducers/user-reducer.js
--- a/lib/reducers/user-reducer.js
+++ b/lib/reducers/user-reducer.js
@@ -580,9 +580,13 @@
       userStoreOps,
     ];
   } else if (action.type === updateUserAvatarActionTypes.success) {
-    const newUserInfos = _keyBy(userInfo => userInfo.id)(
+    const keyserverUserInfos = _keyBy(userInfo => userInfo.id)(
       action.payload.updates.userInfos,
     );
+    const newUserInfos = discardKeyserverUsernames(
+      keyserverUserInfos,
+      state.userInfos,
+    );
     const userStoreOps: $ReadOnlyArray<UserStoreOperation> =
       convertUserInfosToReplaceUserOps(newUserInfos);
     const processedUserInfos: UserInfos = processUserStoreOps(