diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
index 93cb83d99..6537f55e5 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
@@ -1276,7 +1276,7 @@ object LocalCache {
         val now = TimeUtils.now()
 
         val toBeRemoved = notes.filter {
-            (it.value.event?.expiration() ?: Long.MAX_VALUE) < now
+            it.value.event?.isExpired() == true
         }.values
 
         val childrenToBeRemoved = mutableListOf<Note>()
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/Event.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/Event.kt
index a51cfa3a4..7e102bf12 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/Event.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/Event.kt
@@ -126,6 +126,8 @@ open class Event(
         null
     }
 
+    override fun isExpired() = (expiration() ?: Long.MAX_VALUE) < TimeUtils.now()
+
     override fun getTagOfAddressableKind(kind: Int): ATag? {
         val kindStr = kind.toString()
         val aTag = tags
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/EventInterface.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/EventInterface.kt
index 1ded89bf5..e8cec5744 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/EventInterface.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/EventInterface.kt
@@ -70,4 +70,5 @@ interface EventInterface {
 
     fun taggedEmojis(): List<EmojiUrl>
     fun matchTag1With(text: String): Boolean
+    fun isExpired(): Boolean
 }