diff --git a/src/main/java/eu/siacs/conversations/entities/Presences.java b/src/main/java/eu/siacs/conversations/entities/Presences.java
index c80783317..9e94ff2b3 100644
--- a/src/main/java/eu/siacs/conversations/entities/Presences.java
+++ b/src/main/java/eu/siacs/conversations/entities/Presences.java
@@ -59,7 +59,9 @@ public class Presences {
 		synchronized (this.presences) {
 			ArrayList<PresenceTemplate> templates = new ArrayList<>(presences.size());
 			for(Presence p : presences.values()) {
-				templates.add(new PresenceTemplate(p.getStatus(),p.getMessage()));
+				if (p.getMessage() != null && !p.getMessage().trim().isEmpty()) {
+					templates.add(new PresenceTemplate(p.getStatus(), p.getMessage()));
+				}
 			}
 			return templates;
 		}