diff --git a/libraries/classes/Controllers/Table/RelationController.php b/libraries/classes/Controllers/Table/RelationController.php
index 8e25a23edc..6074371266 100644
--- a/libraries/classes/Controllers/Table/RelationController.php
+++ b/libraries/classes/Controllers/Table/RelationController.php
@@ -167,6 +167,7 @@ final class RelationController extends AbstractController
             'dbi' => $this->dbi,
             'default_sliders_state' => $GLOBALS['cfg']['InitialSlidersState'],
             'route' => $route,
+            'display_field' => $this->relation->getDisplayField($GLOBALS['db'], $GLOBALS['table']),
         ]);
     }
 
diff --git a/libraries/classes/Twig/RelationExtension.php b/libraries/classes/Twig/RelationExtension.php
index 1775be3427..2ad18b2359 100644
--- a/libraries/classes/Twig/RelationExtension.php
+++ b/libraries/classes/Twig/RelationExtension.php
@@ -20,11 +20,6 @@ class RelationExtension extends AbstractExtension
         $relation = new Relation($GLOBALS['dbi']);
 
         return [
-            new TwigFunction(
-                'get_display_field',
-                [$relation, 'getDisplayField'],
-                ['is_safe' => ['html']]
-            ),
             new TwigFunction(
                 'get_foreign_data',
                 [$relation, 'getForeignData']
diff --git a/templates/table/relation/common_form.twig b/templates/table/relation/common_form.twig
index 2cca11800a..ff093ab77e 100644
--- a/templates/table/relation/common_form.twig
+++ b/templates/table/relation/common_form.twig
@@ -203,14 +203,13 @@
     {% endif %}
 
     {% if relation_parameters.displayFeature is not null %}
-        {% set disp = get_display_field(db, table) %}
         <fieldset class="pma-fieldset">
             <label>{% trans 'Choose column to display:' %}</label>
             <select name="display_field">
                 <option value="">---</option>
                 {% for row in save_row %}
                     <option value="{{ row['Field'] }}"
-                        {%- if disp is defined and row['Field'] == disp %}
+                        {%- if display_field is defined and row['Field'] == display_field %}
                             selected="selected"
                         {%- endif %}>
                         {{ row['Field'] }}