diff --git a/api/src/main/java/jakarta/mail/internet/ParameterList.java b/api/src/main/java/jakarta/mail/internet/ParameterList.java
index 27b92345..6fa6f7d2 100644
--- a/api/src/main/java/jakarta/mail/internet/ParameterList.java
+++ b/api/src/main/java/jakarta/mail/internet/ParameterList.java
@@ -430,8 +430,7 @@ private void combineMultisegmentNames(boolean keepConsistentOnFailure)
                             } else {
                                 if (charset == null) {
                                     // should never happen
-                                    multisegmentNames.remove(name);
-                                    break;
+                                    it.remove(name);
                                 }
                             }
                             decodeBytes(vv.value, bos);