diff --git a/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java b/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java
index dd45d7e46..3b3ce08db 100644
--- a/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java
+++ b/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java
@@ -28,10 +28,11 @@ public class PresenceTemplate extends AbstractEntity {
 
 	@Override
 	public ContentValues getContentValues() {
+		final String show = status.toShowString();
 		ContentValues values = new ContentValues();
 		values.put(LAST_USED, lastUsed);
 		values.put(MESSAGE, statusMessage);
-		values.put(STATUS, status.toShowString());
+		values.put(STATUS, show == null ? "" : show);
 		values.put(UUID, uuid);
 		return values;
 	}