diff --git a/src/bundle/Resources/public/js/scripts/admin.limitation.pick.js b/src/bundle/Resources/public/js/scripts/admin.limitation.pick.js
index 349d1113b8..20e150b867 100644
--- a/src/bundle/Resources/public/js/scripts/admin.limitation.pick.js
+++ b/src/bundle/Resources/public/js/scripts/admin.limitation.pick.js
@@ -91,8 +91,13 @@
         selectedItems.forEach((location) => {
             const locationId = location.id;
             const container = doc.createElement('ul');
-            const renderedItem = tagTemplate.replace('{{ location_id }}', locationId);
 
+            container.insertAdjacentHTML('beforeend', tagTemplate);
+
+            const tagTemplateUnescaped = container.innerHTML;
+            const renderedItem = tagTemplateUnescaped.replace('{{ location_id }}', locationId);
+
+            container.innerHTML = '';
             container.insertAdjacentHTML('beforeend', renderedItem);
 
             const listItemNode = container.querySelector('li');
diff --git a/src/bundle/Resources/views/themes/admin/limitation/udw_limitation_value_list_item.html.twig b/src/bundle/Resources/views/themes/admin/limitation/udw_limitation_value_list_item.html.twig
index 81aa4f31a3..a713101675 100755
--- a/src/bundle/Resources/views/themes/admin/limitation/udw_limitation_value_list_item.html.twig
+++ b/src/bundle/Resources/views/themes/admin/limitation/udw_limitation_value_list_item.html.twig
@@ -1,7 +1,6 @@
 <li class="mt-2">
     {{ include('@ibexadesign/ui/tag.html.twig', {
         'content': content_breadcrumbs,
-        'location_id': location_id,
         'is_loading_state': is_loading_state,
         'tag_attributes': {
             'data-location-id': location_id,