diff --git a/controllers/argocd/notifications_util.go b/controllers/argocd/notifications_util.go
index 7fb753f98..ab8dec9e8 100644
--- a/controllers/argocd/notifications_util.go
+++ b/controllers/argocd/notifications_util.go
@@ -526,8 +526,8 @@ func getDefaultNotificationsTriggers() map[string]string {
   oncePer: app.status.operationState.syncResult.revision
   send:
   - app-deployed
-  when: app.status.operationState.phase in ['Succeeded'] and app.status.health.status
-      == 'Healthy'`
+  when: app.status.operationState != nil and app.status.operationState.phase in ['Succeeded'] and app.status.health.status
+      == 'Healthy' and !time.Parse(app.status.health.lastTransitionTime).Before(time.Parse(app.status.operationState.finishedAt))`
 
 	notificationsTriggers["trigger.on-health-degraded"] = `- description: Application has degraded
   send: