diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/ExpirationTimerView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/ExpirationTimerView.java
index a42b1a564..ddd76626b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/ExpirationTimerView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/ExpirationTimerView.java
@@ -7,6 +7,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
 
 import org.session.libsession.utilities.Util;
+import org.thoughtcrime.securesms.database.model.MessageRecord;
 
 import java.lang.ref.WeakReference;
 import java.util.concurrent.TimeUnit;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
index 3e370104e..994fbd015 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
@@ -9,6 +9,8 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.RecyclerView
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ViewControlMessageBinding
+import org.session.libsession.utilities.getColorFromAttr
+import org.thoughtcrime.securesms.conversation.v2.components.ExpirationTimerView
 import org.thoughtcrime.securesms.database.model.MessageRecord
 
 class ControlMessageView : LinearLayout {
@@ -34,9 +36,10 @@ class ControlMessageView : LinearLayout {
         binding.root.contentDescription= null
         when {
             message.isExpirationTimerUpdate -> {
-                binding.iconImageView.setImageDrawable(
-                    ResourcesCompat.getDrawable(resources, R.drawable.ic_timer, context.theme)
-                )
+                ExpirationTimerView(binding.iconImageView, context.getColorFromAttr(android.R.attr.textColorPrimary)).apply {
+                    setExpirationTime(message.expireStarted, message.expiresIn)
+                    startAnimation()
+                }
                 binding.iconImageView.visibility = View.VISIBLE
             }
             message.isMediaSavedNotification -> {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index e30f612bf..8ffad9828 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -352,9 +352,7 @@ class VisibleMessageView : LinearLayout {
             if (message.expireStarted > 0) {
                 expirationTimerView.setExpirationTime(message.expireStarted, message.expiresIn)
                 expirationTimerView.startAnimation()
-                if (message.expireStarted + message.expiresIn <= SnodeAPI.nowWithOffset) {
-                    ApplicationContext.getInstance(context).expiringMessageManager.checkSchedule()
-                }
+                ApplicationContext.getInstance(context).expiringMessageManager.checkSchedule()
             } else {
                 expirationTimerView.setPercentComplete(0.0f)
                 expirationTimerView.stopAnimation()