diff --git a/Azaion.Common/Services/AnnotationService.cs b/Azaion.Common/Services/AnnotationService.cs
index 4fc8dfb..eaf071a 100644
--- a/Azaion.Common/Services/AnnotationService.cs
+++ b/Azaion.Common/Services/AnnotationService.cs
@@ -82,7 +82,7 @@ public class AnnotationService : INotificationHandler<AnnotationsDeletedEvent>
                     return Task.CompletedTask;
                 }, SaveTaskId, TimeSpan.FromSeconds(5), cancellationToken);
 
-                if (msg.CreatedRole != RoleEnum.Operator) //Process only operator's messages
+                if (msg.CreatedEmail == _authProvider.CurrentUser.Email) //Don't process messages by yourself
                     return;
 
                 await SaveAnnotationInner(
@@ -106,7 +106,7 @@ public class AnnotationService : INotificationHandler<AnnotationsDeletedEvent>
     {
         a.Time = TimeSpan.FromMilliseconds(a.Milliseconds);
         return await SaveAnnotationInner(DateTime.Now, a.OriginalMediaName, a.Time, ".jpg", a.Detections.ToList(),
-            a.Source, new MemoryStream(a.Image), a.CreatedRole, a.CreatedEmail, generateThumbnail: true, cancellationToken);
+            a.Source, new MemoryStream(a.Image), _authProvider.CurrentUser.Role, _authProvider.CurrentUser.Email, generateThumbnail: true, cancellationToken);
     }
 
     //Manual
diff --git a/Azaion.Common/Services/FailsafeProducer.cs b/Azaion.Common/Services/FailsafeProducer.cs
index 31ea320..92f8ada 100644
--- a/Azaion.Common/Services/FailsafeProducer.cs
+++ b/Azaion.Common/Services/FailsafeProducer.cs
@@ -76,8 +76,9 @@ public class FailsafeAnnotationsProducer
                             await _annotationConfirmProducer.Send(validatedMessages, CompressionType.Gzip);
 
                         await _dbFactory.Run(async db =>
-                            await db.AnnotationsQueue.DeleteAsync(aq => messagesChunk.Any(x => aq.Name == x.OriginalMediaName), token: cancellationToken));
+                            await db.AnnotationsQueue.DeleteAsync(aq => messagesChunk.Any(x => aq.Name == x.Name), token: cancellationToken));
                         sent = true;
+                        _dbFactory.SaveToDisk();
                     }
                     catch (Exception e)
                     {