diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
index b409c1702..2baf82bd2 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
@@ -201,7 +201,7 @@ private fun RenderWord(
     nav: (String) -> Unit,
     tags: List<List<String>>?
 ) {
-    val wordSpace = remember {
+    val wordSpace = remember(word) {
         "$word "
     }
 
diff --git a/app/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt b/app/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt
index 7dfe7a4e7..630c9ac15 100644
--- a/app/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt
+++ b/app/src/play/java/com/vitorpamplona/amethyst/ui/components/TranslatableRichTextViewer.kt
@@ -68,7 +68,7 @@ fun TranslatableRichTextViewer(
         }
     }
 
-    val toBeViewed by remember {
+    val toBeViewed by remember(translatedTextState) {
         derivedStateOf {
             if (showOriginal) content else translatedTextState.result ?: content
         }