diff --git a/modules/claim/back/methods/claim/updateClaim.js b/modules/claim/back/methods/claim/updateClaim.js
index a206d7f3e..c99e0e2f1 100644
--- a/modules/claim/back/methods/claim/updateClaim.js
+++ b/modules/claim/back/methods/claim/updateClaim.js
@@ -88,15 +88,17 @@ module.exports = Self => {
             const updatedClaim = await claim.updateAttributes(args, myOptions);
 
             // When pickup has been changed
-            if (salesPerson && changedPickup && updatedClaim.pickup)
-                await notifyPickUp(ctx, salesPerson.id, claim);
+            if (salesPerson) {
+                if (changedPickup && updatedClaim.pickup)
+                    await notifyPickUp(ctx, salesPerson.id, claim);
 
-            // When claimState has been changed
-            if (args.claimStateFk) {
-                const newState = await models.ClaimState.findById(args.claimStateFk, null, myOptions);
-                await notifyStateChange(ctx, salesPerson.id, claim, newState.description);
-                if (newState.code == 'canceled')
-                    await notifyStateChange(ctx, claim.workerFk, claim, newState.description);
+                // When claimState has been changed
+                if (args.claimStateFk) {
+                    const newState = await models.ClaimState.findById(args.claimStateFk, null, myOptions);
+                    await notifyStateChange(ctx, salesPerson.id, claim, newState.description);
+                    if (newState.code == 'canceled')
+                        await notifyStateChange(ctx, claim.workerFk, claim, newState.description);
+                }
             }
 
             if (tx) await tx.commit();