diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
index 05cf31b1..db070a96 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
@@ -406,10 +406,9 @@ class ComposeViewModel
         }
 
 
-        composeOptions?.savedTootUid?.let { uid ->
-            this.savedTootUid = uid
-            startingText = composeOptions.tootText
-        }
+        savedTootUid = composeOptions?.savedTootUid ?: 0
+        startingText = composeOptions?.tootText
+
 
         val tootVisibility = composeOptions?.visibility ?: Status.Visibility.UNKNOWN
         if (tootVisibility.num != Status.Visibility.UNKNOWN.num) {