diff --git a/components/views/chat/message/Message.vue b/components/views/chat/message/Message.vue
index 94a8eba78e..4c2d1cf9c1 100644
--- a/components/views/chat/message/Message.vue
+++ b/components/views/chat/message/Message.vue
@@ -309,6 +309,14 @@ export default Vue.extend({
           address,
           this.$store.state.friends,
         )
+        if (!recipient) {
+          this.$store.dispatch('textile/editTextMessage', {
+            to: this.$store.state.friends.activeConversation.target
+              .textilePubkey,
+            original: this.$props.message,
+            text: message,
+          })
+        }
         this.$store.dispatch('textile/editTextMessage', {
           to: recipient?.textilePubkey,
           original: this.$props.message,