diff --git a/src/components/profileInfoMixin.js b/src/components/profileInfoMixin.js
index b93ba9a..02bd1e5 100644
--- a/src/components/profileInfoMixin.js
+++ b/src/components/profileInfoMixin.js
@@ -12,7 +12,7 @@ export default {
         if (!this.user) {
           return null;
         }
-        return (this.user.displayName || this.user.userId);
+        return this.user.displayName;
       },
       set(newValue) {
         this.user.displayName = newValue
@@ -46,7 +46,7 @@ export default {
       })
     },
     updateDisplayName(name) {
-      this.$matrix.matrixClient.setDisplayName(name);
+      this.$matrix.matrixClient.setDisplayName(name || this.user.userId);
     }
   }
 }
\ No newline at end of file