diff --git a/templates/field/field--tpr-unit--provided-languages.html.twig b/templates/field/field--tpr-unit--provided-languages.html.twig
deleted file mode 100644
index d60ff8502..000000000
--- a/templates/field/field--tpr-unit--provided-languages.html.twig
+++ /dev/null
@@ -1,19 +0,0 @@
-{%
-  set languages = {
-    'fi': 'Finnish',
-    'sv': 'Swedish',
-    'en': 'English'
-  }
-%}
-
-{%- for item in items -%}
-  {% set provided_language = languages[item.content['#context']['value']]|t %}
-
-  {%- if language.id != 'en' -%}
-    {{- provided_language|lower -}}
-  {%- else -%}
-    {{- provided_language -}}
-  {%- endif -%}
-
-  {% if not loop.last %}, {% endif %}
-{%- endfor -%}
diff --git a/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig b/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig
index bbacacb1f..2abc1a5dc 100644
--- a/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig
+++ b/templates/module/helfi_tpr/tpr-unit-contact-information.html.twig
@@ -60,13 +60,13 @@
         {{ content.opening_hours }}
       </div>
     {% endif %}
-    {% if content.provided_languages|render %}
+    {% if content.provided_languages['#object'].getProvidedLanguageNames() %}
       <div class="unit__contact-row unit__contact-row--provided-languages">
         <label class="unit__contact-row__label">
           {% include '@hdbt/misc/icon.twig' ignore missing with {icon: 'globe'} %}
           {{ 'Service language'|t({}, {'context': 'TPR unit contact information service language'}) }}:
         </label>
-        {{ content.provided_languages }}
+        {{ content.provided_languages['#object'].getProvidedLanguageNames() }}
       </div>
     {% endif %}
     {% if content.address_postal|render %}