diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
index fb10bdb65..afe8b072b 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
@@ -970,12 +970,20 @@ private fun RenderHighlight(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
 ) {
-    val noteEvent = note.event as? HighlightEvent ?: return
+    val quote = remember {
+        (note.event as? HighlightEvent)?.quote() ?: ""
+    }
+    val author = remember() {
+        (note.event as? HighlightEvent)?.author()
+    }
+    val url = remember() {
+        (note.event as? HighlightEvent)?.inUrl()
+    }
 
     DisplayHighlight(
-        noteEvent.quote(),
-        noteEvent.author(),
-        noteEvent.inUrl(),
+        quote,
+        author,
+        url,
         makeItShort,
         canPreview,
         backgroundColor,