diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js
index a73f3c3..c8c1f52 100644
--- a/app/src/RoomClient.js
+++ b/app/src/RoomClient.js
@@ -129,7 +129,8 @@ export default class RoomClient
 		this._forceTcp = forceTcp;
 
 		// Use displayName
-		store.dispatch(settingsActions.setDisplayName(displayName));
+		if (displayName)
+			store.dispatch(settingsActions.setDisplayName(displayName));
 
 		// Torrent support
 		this._torrentSupport = null;