diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
index ed5f4aced0..910305de9b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
@@ -207,7 +207,7 @@ public final class AvatarUtil {
     private final int size;
 
     private AvatarTarget(int size) {
-      this.size = size;
+      this.size = size == UNDEFINED_SIZE ? DrawableUtil.SHORTCUT_INFO_WRAPPED_SIZE : size;
     }
 
     public @Nullable Bitmap await() throws InterruptedException {