diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5646f1f..2cdcb189 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
    * Prevent fields from being toggled incorrectly by adding originalValue to childs of fieldset. [#2218](https://github.com/getgrav/grav-plugin-admin/pull/2218)
    * Fixed persistent focus on Folder field when Adding page (Safari) [#2209](https://github.com/getgrav/grav-plugin-admin/issues/2209)
    * Fixed performance of Plugins / Themes sort in the installation table
+   * Fixed list field with key/value pairs throwing an exception due to bad value [#2199](https://github.com/getgrav/grav-plugin-admin/issues/2199)
 
 # v1.10.29
 ## 01/28/2022
diff --git a/themes/grav/templates/forms/fields/list/list.html.twig b/themes/grav/templates/forms/fields/list/list.html.twig
index 7eb424c3..a8acd9e5 100644
--- a/themes/grav/templates/forms/fields/list/list.html.twig
+++ b/themes/grav/templates/forms/fields/list/list.html.twig
@@ -87,7 +87,7 @@
                                     {% elseif child.name == 'value' %}
                                         {# Special handling for the value field #}
                                         {% set child = child|merge({ name: item_name }) %}
-                                        {% set child_value = value %}
+                                        {% set child_value = val %}
                                     {% else %}
                                         {% set child_value = form ? form.value(child.name) : data.value(child.name) %}
                                     {% endif %}