diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index d77f4da595f0f4c11f38a39b8d66a24467c065bb..45a6fd817c695f7bb537e6fa3dd71522fa0b90a1 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
@@ -298,7 +298,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
 		}
 		bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
 		Canvas canvas = new Canvas(bitmap);
-		final String trimmedName = name.trim();
+		final String trimmedName = name == null ? "" : name.trim();
 		drawTile(canvas, trimmedName, 0, 0, size, size);
 		mXmppConnectionService.getBitmapCache().put(KEY, bitmap);
 		return bitmap;