diff --git a/e2e/paths/06-claim/04_claim_action.spec.js b/e2e/paths/06-claim/04_claim_action.spec.js
index 34a9c6102..e7ab8638c 100644
--- a/e2e/paths/06-claim/04_claim_action.spec.js
+++ b/e2e/paths/06-claim/04_claim_action.spec.js
@@ -72,26 +72,10 @@ describe('Claim action path', () => {
         expect(message.type).toBe('success');
     });
 
-    /*     it('should check the "Pick up" checkbox', async() => {
-        await page.waitToClick(selectors.claimAction.hasToPickUpCheckbox);
-        const message = await page.waitForSnackbar();
-
-        expect(message.type).toBe('success');
-    }); */
-
     it('should confirm the "is paid with mana" is checked', async() => {
         await page.reloadSection('claim.card.action');
         const isPaidWithManaCheckbox = await page.checkboxState(selectors.claimAction.isPaidWithManaCheckbox);
 
         expect(isPaidWithManaCheckbox).toBe('checked');
     });
-
-    /* it('should confirm the "is paid with mana" and "Pick up" checkbox are checked', async() => {
-        await page.reloadSection('claim.card.action');
-        const isPaidWithManaCheckbox = await page.checkboxState(selectors.claimAction.isPaidWithManaCheckbox);
-        const hasToPickUpCheckbox = await page.checkboxState(selectors.claimAction.hasToPickUpCheckbox);
-
-        expect(isPaidWithManaCheckbox).toBe('checked');
-        expect(hasToPickUpCheckbox).toBe('checked');
-    }); */
 });
diff --git a/modules/claim/back/methods/claim/updateClaim.js b/modules/claim/back/methods/claim/updateClaim.js
index de74c54e8..61b8085d3 100644
--- a/modules/claim/back/methods/claim/updateClaim.js
+++ b/modules/claim/back/methods/claim/updateClaim.js
@@ -54,7 +54,7 @@ module.exports = Self => {
 
         // Get sales person from claim client
         const salesPerson = claim.client().salesPerson();
-        if (salesPerson && updatedClaim.hasToPickUp) {
+        if (salesPerson && changedHasToPickUp && updatedClaim.hasToPickUp) {
             const origin = ctx.req.headers.origin;
             const message = $t('Claim will be picked', {
                 claimId: claim.id,