diff --git a/src/main/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java b/src/main/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java
index 7af00158e..cb12d47ee 100644
--- a/src/main/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java
+++ b/src/main/java/org/gridsuite/modification/server/repositories/NetworkModificationRepository.java
@@ -307,10 +307,11 @@ public void updateModification(@NonNull UUID modificationUuid, @NonNull Modifica
     public void deleteStashedModificationInGroup(UUID groupUuid, boolean errorOnGroupNotFound) {
         try {
             ModificationGroupEntity groupEntity = getModificationGroup(groupUuid);
-            if (!groupEntity.getModifications().isEmpty()) {
-                List<UUID> stashedModifications = groupEntity.getModifications().stream()
-                    .filter(ModificationEntity::getStashed).map(ModificationEntity::getId).collect(Collectors.toList());
-                deleteModifications(groupUuid, stashedModifications);
+            List<UUID> stashedModificationUuids = groupEntity.getModifications().stream()
+                    .filter(modification -> modification != null && modification.getStashed())
+                    .map(ModificationEntity::getId).collect(Collectors.toList());
+            if (!stashedModificationUuids.isEmpty()) {
+                deleteModifications(groupUuid, stashedModificationUuids);
             }
         } catch (NetworkModificationException e) {
             if (e.getType() == MODIFICATION_GROUP_NOT_FOUND && !errorOnGroupNotFound) {