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 0da6f69848..0c4e32eb49 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarUtil.java
@@ -114,7 +114,7 @@ public final class AvatarUtil {
 
   @WorkerThread
   public static @NonNull IconCompat getIconCompat(@NonNull Context context, @NonNull Recipient recipient) {
-    if (Build.VERSION.SDK_INT > 29) {
+    if (Build.VERSION.SDK_INT > 29 && Build.VERSION.SDK_INT < 36) {
       return IconCompat.createWithContentUri(AvatarProvider.getContentUri(recipient.getId()));
     } else {
       return IconCompat.createWithBitmap(getBitmapForNotification(context, recipient, AdaptiveBitmapMetrics.getInnerWidth()));