diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue
index dfb6957a..04803772 100644
--- a/src/components/GiftedDialog.vue
+++ b/src/components/GiftedDialog.vue
@@ -227,11 +227,11 @@
             query: {
               amountInput,
               description,
-              giverDid: giver?.did,
+              giverDid: showProjects ? undefined : giver?.did,
               giverName: giver?.name,
               offerId,
-              fulfillsProjectId: toProjectId,
-              providerProjectId: fromProjectId,
+              fulfillsProjectId: showProjects && isFromProjectView ? giver?.handleId : toProjectId,
+              providerProjectId: showProjects ? giver?.handleId : fromProjectId,
               recipientDid: receiver?.did,
               recipientName: receiver?.name,
               unitCode,
@@ -519,7 +519,7 @@ export default class GiftedDialog extends Vue {
         this.offerId,
         false,
         undefined,
-        this.showProjects && !this.isFromProjectView ? this.giver?.handleId : undefined,
+        this.showProjects ? this.giver?.handleId : undefined,
       );
 
       if (!result.success) {