diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarImage.kt b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarImage.kt
index 1a987a6ef9..8ab745091f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarImage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarImage.kt
@@ -29,7 +29,6 @@ fun AvatarImage(
   useProfile: Boolean = true
 ) {
   val context = LocalContext.current
-  val state = recipient.live().liveData.map { AvatarImageState(NameUtil.getAbbreviation(it.getDisplayName(context)), it, AvatarHelper.getAvatarFileDetails(context, it.id)) }.observeAsState().value ?: return
 
   if (LocalInspectionMode.current) {
     Spacer(
@@ -37,6 +36,8 @@ fun AvatarImage(
         .background(color = Color.Red, shape = CircleShape)
     )
   } else {
+    val state = recipient.live().liveData.map { AvatarImageState(NameUtil.getAbbreviation(it.getDisplayName(context)), it, AvatarHelper.getAvatarFileDetails(context, it.id)) }.observeAsState().value ?: return
+
     AndroidView(
       factory = ::AvatarImageView,
       modifier = modifier.background(color = Color.Transparent, shape = CircleShape)