diff --git a/src/Core/Services/NotificationService.cs b/src/Core/Services/NotificationService.cs
index 0f418b9..67e2e13 100644
--- a/src/Core/Services/NotificationService.cs
+++ b/src/Core/Services/NotificationService.cs
@@ -22,6 +22,7 @@ public async Task<ErrorOr<NotificationDto>> CreateNotification(
 
         ct.ThrowIfCancellationRequested();
         await notificationsRepository.InsertOne(notification);
+        dto = dto with { Id = notification.Id.ToString() };
 
         var deliveryRequests = CreateDeliveryRequests(dto).ToList();
 
@@ -31,8 +32,7 @@ public async Task<ErrorOr<NotificationDto>> CreateNotification(
             await notificationsAnalyticsClient
                 .SendNotificationCreated(deliveryRequest.NotificationId, ct);
         }
-        
-        dto = dto with { Id = notification.Id.ToString() };
+
         return dto;
     }