diff --git a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
index b47c5732..ab9cc058 100644
--- a/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
+++ b/Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
@@ -89,9 +89,9 @@ namespace Oqtane.Infrastructure
}
// validate recipient
- if (string.IsNullOrEmpty(notification.ToEmail))
+ if (string.IsNullOrEmpty(notification.ToEmail) || !MailAddress.TryCreate(notification.ToEmail, out _))
{
- log += "Recipient Missing For NotificationId: " + notification.NotificationId + "
";
+ log += $"NotificationId: {notification.NotificationId} - Has Missing Or Invalid Recipient {notification.ToEmail}
";
notification.IsDeleted = true;
notificationRepository.UpdateNotification(notification);
}