diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 4aee6079e..236877a5b 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -3245,7 +3245,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void changeStatus(Account account, Presence.Status status, String statusMessage) {
-		databaseBackend.insertPresenceTemplate(new PresenceTemplate(status, statusMessage));
+		if (!statusMessage.isEmpty()) {
+			databaseBackend.insertPresenceTemplate(new PresenceTemplate(status, statusMessage));
+		}
 		changeStatusReal(account, status, statusMessage);
 	}
 
@@ -3259,7 +3261,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void changeStatus(Presence.Status status, String statusMessage) {
-		databaseBackend.insertPresenceTemplate(new PresenceTemplate(status, statusMessage));
+		if (!statusMessage.isEmpty()) {
+			databaseBackend.insertPresenceTemplate(new PresenceTemplate(status, statusMessage));
+		}
 		for(Account account : getAccounts()) {
 			changeStatusReal(account, status, statusMessage);
 		}