Merge branch 'erikj/events_move' of github.com:matrix-org/synapse into erikj/perf

1 files changed, 3 insertions, 0 deletions

diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py

index 71ff78ab23..799faffe53 100644
--- a/synapse/handlers/profile.py
+++ b/synapse/handlers/profile.py
@@ -88,6 +88,9 @@ class ProfileHandler(BaseHandler):
         if target_user != auth_user:
             raise AuthError(400, "Cannot set another user's displayname")
 
+        if new_displayname == '':
+            new_displayname = None
+
         yield self.store.set_profile_displayname(
             target_user.localpart, new_displayname
         )