diff --git a/common/src/main/java/io/xeres/common/message/chat/ChatRoomUserEvent.java b/common/src/main/java/io/xeres/common/message/chat/ChatRoomUserEvent.java
index 787daa31..be69576d 100644
--- a/common/src/main/java/io/xeres/common/message/chat/ChatRoomUserEvent.java
+++ b/common/src/main/java/io/xeres/common/message/chat/ChatRoomUserEvent.java
@@ -35,7 +35,7 @@ public ChatRoomUserEvent()
 	public ChatRoomUserEvent(GxsId gxsId, String nickname, long identityId)
 	{
 		this.gxsId = gxsId;
-		this.nickname = nickname != null ? nickname : ""; // Workaround against users having a null nickname
+		this.nickname = nickname;
 		this.identityId = identityId;
 	}
 
@@ -51,7 +51,7 @@ public void setGxsId(GxsId gxsId)
 
 	public String getNickname()
 	{
-		return nickname;
+		return nickname != null ? nickname : ""; // Workaround against users having a null nickname
 	}
 
 	public void setNickname(String nickname)