diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index bde69912089f531ff694fe6ab59a0ec84fe0b3a3..8396720042bbfc32dd9a451a54afd2cbf9af2165 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
@@ -272,7 +272,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
 				'\0' +
 				user.getMuc() +
 				'\0' +
-				user.getOccupantId() == null ? emptyOnNull(user.getFullJid()) : user.getOccupantId() +
+				(user.getOccupantId() == null ? emptyOnNull(user.getFullJid()) : user.getOccupantId()) +
 				'\0' +
 				emptyOnNull(user.getRealJid()) +
 				'\0' +