diff --git a/Resources/views/CustomFieldsRendering/choice.csv.twig b/Resources/views/CustomFieldsRendering/choice.csv.twig
index 159ec3ce3..1538fd437 100644
--- a/Resources/views/CustomFieldsRendering/choice.csv.twig
+++ b/Resources/views/CustomFieldsRendering/choice.csv.twig
@@ -2,9 +2,9 @@
 {%- for choice in choices -%}
     {% if choice['slug'] in selected %}
         {%- if choice['slug'] is not same as('_other') -%}
-            {{ choice['name']|localize_translatable_string|replace({'"':'""'})|raw }}
+            {{ choice['name']|localize_translatable_string|csv_cell }}
         {%- else -%}
-            {{ choice['name']|replace({'"':'""'})|raw }}
+            {{ choice['name']|csv_cell }}
         {%- endif -%}
     {% endif %}
 {%- endfor -%}
diff --git a/Resources/views/CustomFieldsRendering/text.csv.twig b/Resources/views/CustomFieldsRendering/text.csv.twig
index 16dfb6f4d..03b805bbb 100644
--- a/Resources/views/CustomFieldsRendering/text.csv.twig
+++ b/Resources/views/CustomFieldsRendering/text.csv.twig
@@ -1 +1 @@
-{% if text is not empty %}{{ text|replace({'"':'""'})|raw }}{% else %}{{ 'None'|trans }}{% endif %}
\ No newline at end of file
+{% if text is not empty %}{{ text|csv_cell}}{% else %}{{ 'None'|trans }}{% endif %}
\ No newline at end of file