diff --git a/src/libs/endorserServer.ts b/src/libs/endorserServer.ts
index ce2b5753a..06a3f28c5 100644
--- a/src/libs/endorserServer.ts
+++ b/src/libs/endorserServer.ts
@@ -604,19 +604,19 @@ export function hydrateGive(
   }
   // ... and replace or add each element, ending with Trade or Donate
   // I realize this doesn't change any elements that are not PlanAction or Offer or Trade/Action.
+  vcClaim.fulfills = vcClaim.fulfills.filter(
+    (elem) => elem["@type"] !== "PlanAction",
+  );
   if (fulfillsProjectHandleId) {
-    vcClaim.fulfills = vcClaim.fulfills.filter(
-      (elem) => elem["@type"] !== "PlanAction",
-    );
     vcClaim.fulfills.push({
       "@type": "PlanAction",
       identifier: fulfillsProjectHandleId,
     });
   }
+  vcClaim.fulfills = vcClaim.fulfills.filter(
+    (elem) => elem["@type"] !== "Offer",
+  );
   if (fulfillsOfferHandleId) {
-    vcClaim.fulfills = vcClaim.fulfills.filter(
-      (elem) => elem["@type"] !== "Offer",
-    );
     vcClaim.fulfills.push({
       "@type": "Offer",
       identifier: fulfillsOfferHandleId,