diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java
index 9d587075..76f29a40 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/UnprocessedChangesService.java
@@ -43,7 +43,11 @@ public class UnprocessedChangesService {
         List<UnprocessedManualEntity> unprocessedManualEntities = new ArrayList<>();
         Set<String> annotationIds = manualRedactions.getEntriesToAdd().stream().map(ManualRedactionEntry::getAnnotationId).collect(Collectors.toSet());
 
-        List<ManualEntity> notFoundManualEntities = manualEntityCreationService.toTextEntity(manualEntitiesConverter(manualRedactions), document);
+        List<ManualEntity> notFoundManualEntities = new ArrayList<>();
+        List<ManualEntity> manualEntities = manualEntitiesConverter(manualRedactions);
+        if (!manualEntities.isEmpty()) {
+            notFoundManualEntities = manualEntityCreationService.toTextEntity(manualEntities, document);
+        }
 
         document.getEntities().forEach(textEntity -> {
             Set<String> processedIds = new HashSet<>();
@@ -107,6 +111,7 @@ public class UnprocessedChangesService {
     private List<ManualEntity> manualEntitiesConverter(ManualRedactions manualRedactions) {
 
         return manualRedactions.getEntriesToAdd().stream()
+                .filter(manualRedactionEntry -> manualRedactionEntry.getPositions() != null && !manualRedactionEntry.getPositions().isEmpty())
                 .map(manualRedactionEntry -> ManualEntity.fromManualRedactionEntry(manualRedactionEntry,
                         manualRedactionEntry.getType() != null && manualRedactionEntry.getType().equals("hint_only"))).toList();
     }