diff --git a/src/org/thoughtcrime/securesms/contacts/ContactPhotoFactory.java b/src/org/thoughtcrime/securesms/contacts/ContactPhotoFactory.java
index 5e5f5d929d..a3ae382e43 100644
--- a/src/org/thoughtcrime/securesms/contacts/ContactPhotoFactory.java
+++ b/src/org/thoughtcrime/securesms/contacts/ContactPhotoFactory.java
@@ -54,18 +54,24 @@ public class ContactPhotoFactory {
   }
 
   public static Drawable getDefaultContactPhoto(Context context, @Nullable String name) {
+    int targetSize = context.getResources().getDimensionPixelSize(R.dimen.contact_photo_target_size);
+
     if (name != null && !name.isEmpty()) {
-      int targetSize = context.getResources().getDimensionPixelSize(R.dimen.contact_photo_target_size);
       return TextDrawable.builder().beginConfig()
                          .width(targetSize)
                          .height(targetSize)
-                         .endConfig().buildRound(String.valueOf(name.charAt(0)),
+                         .endConfig()
+                         .buildRound(String.valueOf(name.charAt(0)),
                                                  COLOR_GENERATOR.getColor(name));
     }
 
     synchronized (defaultPhotoLock) {
       if (defaultContactPhoto == null)
-        defaultContactPhoto = TextDrawable.builder().buildRound("#", UNKNOWN_COLOR);
+        defaultContactPhoto = TextDrawable.builder().beginConfig()
+                                          .width(targetSize)
+                                          .height(targetSize)
+                                          .endConfig()
+                                          .buildRound("#", UNKNOWN_COLOR);
 
       return defaultContactPhoto;
     }