diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt
index 5a48184a2..cc784e243 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/ExpandableRichTextViewer.kt
@@ -67,7 +67,15 @@ fun ExpandableRichTextViewer(
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit,
 ) {
-    var showFullText by remember { mutableStateOf(ShowFullTextCache.cache[id] ?: false) }
+    var showFullText by remember {
+        val cached = ShowFullTextCache.cache[id]
+        if (cached == null) {
+            ShowFullTextCache.cache.put(id, false)
+            mutableStateOf(false)
+        } else {
+            mutableStateOf(cached)
+        }
+    }
 
     val whereToCut = remember(content) { ExpandableTextCutOffCalculator.indexToCutOff(content) }