diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
index ae52d71f3..c77e1235e 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -1420,8 +1420,8 @@ class Account(
             eventId = idHex,
             signer = signer,
         ) {
-            Client.send(it, relayList = relayList)
             LocalCache.justConsume(it, null)
+            Client.send(it, relayList = relayList)
         }
     }
 
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt
index 510e258be..21439fb7f 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt
@@ -280,7 +280,9 @@ open class NewPostViewModel() : ViewModel() {
             }
 
             it.author?.let {
-                if (this.pTags?.contains(it) != true) {
+                if (this.pTags == null) {
+                    this.pTags = listOf(it)
+                } else if (this.pTags?.contains(it) != true) {
                     this.pTags = listOf(it) + (this.pTags ?: emptyList())
                 }
             }