diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
index 67a1cd522..a48c7e45c 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
@@ -1014,7 +1014,7 @@ fun observeEdits(
     accountViewModel: AccountViewModel,
 ): State<GenericLoadable<EditState>> {
     if (baseNote.event !is TextNoteEvent) {
-        return remember { mutableStateOf(GenericLoadable.Empty()) }
+        return EmptyState
     }
 
     val editState =
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TextModification.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TextModification.kt
index a83e6e20a..193106b3a 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TextModification.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/TextModification.kt
@@ -223,6 +223,8 @@ fun RenderTextModificationEvent(
     }
 }
 
+val EmptyState = mutableStateOf<GenericLoadable<EditState>>(GenericLoadable.Empty())
+
 @Stable
 class EditState {
     private var modificationsList: List<Note> = persistentListOf()