diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt
index 208fa2529..f1b928928 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/ThreadAssembler.kt
@@ -6,10 +6,10 @@ import kotlin.time.measureTimedValue
 class ThreadAssembler {
 
   fun searchRoot(note: Note, testedNotes: MutableSet<Note> = mutableSetOf()): Note? {
-    testedNotes.add(note)
-
     if (note.replyTo == null || note.replyTo?.isEmpty() == true) return note
 
+    testedNotes.add(note)
+
     val markedAsRoot = note.event?.tags?.firstOrNull { it[0] == "e" && it.size > 3 && it[3] == "root" }?.getOrNull(1)
     if (markedAsRoot != null) return LocalCache.checkGetOrCreateNote(markedAsRoot)