diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration.kt
index c7cc21b41b..d21f7bfffc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration.kt
@@ -53,6 +53,10 @@ class OpenableGiftItemDecoration(context: Context) : RecyclerView.ItemDecoration
   private val bowHeight = DimensionUnit.DP.toPixels(60f)
   private val bowDrawable: Drawable = AppCompatResources.getDrawable(context, R.drawable.ic_gift_bow)!!
 
+  fun hasOpenedGiftThisSession(messageRecordId: Long): Boolean {
+    return messageIdsOpenedThisSession.contains(messageRecordId)
+  }
+
   override fun onDestroy(owner: LifecycleOwner) {
     super.onDestroy(owner)
     animationState.clear()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 3197a58806..92cac0bdef 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -78,6 +78,7 @@ import org.signal.core.util.concurrent.SimpleTask;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.LoggingFragment;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.badges.gifts.OpenableGift;
 import org.thoughtcrime.securesms.badges.gifts.OpenableGiftItemDecoration;
 import org.thoughtcrime.securesms.badges.gifts.viewgift.received.ViewReceivedGiftBottomSheet;
 import org.thoughtcrime.securesms.badges.gifts.viewgift.sent.ViewSentGiftBottomSheet;
@@ -171,6 +172,7 @@ import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.HtmlUtil;
 import org.thoughtcrime.securesms.util.LifecycleDisposable;
 import org.thoughtcrime.securesms.util.MessageRecordUtil;
+import org.thoughtcrime.securesms.util.Projection;
 import org.thoughtcrime.securesms.util.RemoteDeleteUtil;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.SignalLocalMetrics;
@@ -250,6 +252,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
   private TransitionListener          transitionListener;
   private View                        reactionsShade;
   private SignalBottomActionBar       bottomActionBar;
+  private OpenableGiftItemDecoration  openableGiftItemDecoration;
 
   private GiphyMp4ProjectionRecycler giphyMp4ProjectionRecycler;
   private Colorizer                  colorizer;
@@ -318,7 +321,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
 
     RecyclerViewColorizer recyclerViewColorizer = new RecyclerViewColorizer(list);
 
-    OpenableGiftItemDecoration openableGiftItemDecoration = new OpenableGiftItemDecoration(requireContext());
+    openableGiftItemDecoration = new OpenableGiftItemDecoration(requireContext());
     getViewLifecycleOwner().getLifecycle().addObserver(openableGiftItemDecoration);
 
     list.addItemDecoration(openableGiftItemDecoration);
@@ -1560,6 +1563,10 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
 
       MessageRecord messageRecord = item.getConversationMessage().getMessageRecord();
 
+      if (isUnopenedGift(itemView, messageRecord)) {
+        return;
+      }
+
       if (messageRecord.isSecure()                                        &&
           !messageRecord.isRemoteDelete()                                 &&
           !messageRecord.isUpdate()                                       &&
@@ -2078,6 +2085,18 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
     }
   }
 
+  private boolean isUnopenedGift(View itemView, MessageRecord messageRecord) {
+    if (itemView instanceof OpenableGift) {
+      Projection projection = ((OpenableGift) itemView).getOpenableGiftProjection(false);
+      if (projection != null) {
+        projection.release();
+        return !openableGiftItemDecoration.hasOpenedGiftThisSession(messageRecord.getId());
+      }
+    }
+
+    return false;
+  }
+
   public void refreshList() {
     ConversationAdapter listAdapter = getListAdapter();
     if (listAdapter != null) {