diff --git a/common/src/main/java/ctbrec/Config.java b/common/src/main/java/ctbrec/Config.java
index 9ceb8726..1bf2ef51 100644
--- a/common/src/main/java/ctbrec/Config.java
+++ b/common/src/main/java/ctbrec/Config.java
@@ -191,20 +191,24 @@ public class Config {
         final String CTB = "chaturbate.com";
 
         // convert mode notes
+        Map<String, String> convertedModelNotes = new HashMap<>();
         getSettings().modelNotes.forEach((key, value) -> {
             if (key.contains(CTB)) {
-                getSettings().modelNotes.remove(key);
-                getSettings().modelNotes.put(key.toLowerCase(), value);
+                convertedModelNotes.put(key.toLowerCase(), value);
             }
         });
+        getSettings().modelNotes.clear();
+        getSettings().modelNotes.putAll(convertedModelNotes);
 
         // convert model portraits
+        Map<String, String> convertedModelPortraits = new HashMap<>();
         getSettings().modelPortraits.forEach((key, value) -> {
             if (key.contains(CTB)) {
-                getSettings().modelPortraits.remove(key);
-                getSettings().modelPortraits.put(key.toLowerCase(), value);
+                convertedModelPortraits.put(key.toLowerCase(), value);
             }
         });
+        getSettings().modelPortraits.clear();
+        getSettings().modelPortraits.putAll(convertedModelPortraits);
 
         // convert model groups
         getSettings().modelGroups.forEach(mg -> mg.setModelUrls(mg.getModelUrls().stream().map(url -> url.contains(CTB) ? url.toLowerCase() : url)