diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7403945c7..f3d4bd918 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 #### :bug: Bugfixes
 * Fix bug which made it impossible to change an object's preset from a sub-preset to the respective parents preset (e.g. from Driveway to Service Road) ([#9372])
 * Fix corruption of (directional) `cycleway` tags when editing a multi-selection ([#9423])
+* Fix unintended splitting of tag values in `semiCombo` fields into two values when the description contains a comma ([#9471])
 #### :hourglass: Performance
 * Speed up "outdated tags" validation by optimizing order of operations ([#9434], thanks [@Zaczero])
 #### :rocket: Presets
@@ -67,6 +68,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [#9413]: https://github.com/openstreetmap/iD/pull/9413
 [#9423]: https://github.com/openstreetmap/iD/pull/9423
 [#9434]: https://github.com/openstreetmap/iD/pull/9434
+[#9471]: https://github.com/openstreetmap/iD/issues/9471
 [@alanb43]: https://github.com/alanb43
 [@Rewinteer]: https://github.com/Rewinteer
 [@Zaczero]: https://github.com/Zaczero
diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js
index 4bb5f038a..b87af5267 100644
--- a/modules/ui/fields/combo.js
+++ b/modules/ui/fields/combo.js
@@ -353,7 +353,8 @@ export function uiFieldCombo(field, context) {
             if (_isMulti) {
                 vals = [tagValue(utilGetSetValue(_input))];
             } else if (_isSemi) {
-                val = tagValue(utilGetSetValue(_input).replace(/,/g, ';')) || '';
+                val = tagValue(utilGetSetValue(_input)) || '';
+                val = val.replace(/,/g, ';');
                 vals = val.split(';');
             }
             vals = vals.filter(Boolean);