diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue
index d5412ef653..33a8044661 100644
--- a/src/components/GiftedDialog.vue
+++ b/src/components/GiftedDialog.vue
@@ -483,10 +483,13 @@ export default class GiftedDialog extends Vue {
       image: project.image,
       handleId: project.handleId,
     };
-    this.receiver = {
-      did: this.activeDid,
-      name: "You",
-    };
+    // Only set receiver to "You" if no receiver has been selected yet
+    if (!this.receiver || !this.receiver.did) {
+      this.receiver = {
+        did: this.activeDid,
+        name: "You",
+      };
+    }
     this.firstStep = false;
   }