diff --git a/judge/models/problem.py b/judge/models/problem.py
index c2ebf7eb4f..cec1168b9f 100644
--- a/judge/models/problem.py
+++ b/judge/models/problem.py
@@ -76,8 +76,7 @@ def __init__(self, **kwargs):
     def add_i18n_name(self, language):
         queryset = self._clone()
         alias = unique_together_left_join(queryset, ProblemTranslation, 'problem', 'language', language)
-        return queryset.annotate(i18n_name=Coalesce(RawSQL('%s.name' % alias, ()), F('name'),
-                                                    output_field=models.CharField()))
+        return queryset.annotate(i18n_name=RawSQL('%s.name' % alias, ()))
 
 
 class TranslatedProblemForeignKeyQuerySet(QuerySet):
diff --git a/templates/contest/contest.html b/templates/contest/contest.html
index 0207a37591..4b21079de8 100644
--- a/templates/contest/contest.html
+++ b/templates/contest/contest.html
@@ -94,9 +94,9 @@ <h2 style="margin-bottom: 0.2em"><i class="fa fa-fw fa-question-circle"></i>{{ _
                     <tr>
                         <td>
                             {% if problem.is_public %}
-                                <a href="{{ url('problem_detail', problem.code) }}">{{ problem.i18n_name }}</a>
+                                <a href="{{ url('problem_detail', problem.code) }}">{{ problem.i18n_name or problem.name }}</a>
                             {% else %}
-                                {{ problem.i18n_name }}
+                                {{ problem.i18n_name or problem.name }}
                             {% endif %}
                         </td>
                         <td>{{ problem.points|floatformat }}{% if problem.partial %}p{% endif %}</td>
diff --git a/templates/problem/list.html b/templates/problem/list.html
index af29e99b2e..ed2f513a6d 100644
--- a/templates/problem/list.html
+++ b/templates/problem/list.html
@@ -275,7 +275,7 @@ <h3>{{ _('Hot problems') }} <i class="fa fa-fire"></i></h3>
                             {% endif %}
                         {% endif %}
                         <td class="problem">
-                            <a href="{{ url('problem_detail', problem.code) }}">{{ problem.i18n_name }}</a>
+                            <a href="{{ url('problem_detail', problem.code) }}">{{ problem.i18n_name or problem.name }}</a>
                         </td>
                         <td class="category">{{ problem.group.full_name }}</td>
                         {% if show_types %}
diff --git a/templates/submission/list.html b/templates/submission/list.html
index c1f52a0cea..a2acf5a3e8 100644
--- a/templates/submission/list.html
+++ b/templates/submission/list.html
@@ -359,7 +359,7 @@ <h3>{{ _('Statistics') }} <i class="fa fa-pie-chart"></i></h3>
                 {% set profile_id = request.profile.id if request.user.is_authenticated else 0 %}
                 {% for submission in submissions %}
                     <div class="submission-row" id="{{ submission.id }}">
-                        {% with problem_name=show_problem and submission.problem.i18n_name %}
+                        {% with problem_name=show_problem and (submission.problem.i18n_name or submission.problem.name) %}
                             {% include "submission/row.html" %}
                         {% endwith %}
                     </div>