diff --git a/plinth/modules/diagnostics/__init__.py b/plinth/modules/diagnostics/__init__.py
index 7bbf7d15b..1a3942897 100644
--- a/plinth/modules/diagnostics/__init__.py
+++ b/plinth/modules/diagnostics/__init__.py
@@ -112,7 +112,7 @@ def run_on_all_enabled_modules():
             continue
 
         apps.append((app.app_id, app))
-        app_name = app.info.name or _('None')
+        app_name = app.info.name or app.app_id
         current_results['results'][app.app_id] = {'name': app_name}
 
     current_results['apps'] = apps
diff --git a/plinth/modules/diagnostics/templates/diagnostics_app.html b/plinth/modules/diagnostics/templates/diagnostics_app.html
index 6d74d2f15..b1bd75dd4 100644
--- a/plinth/modules/diagnostics/templates/diagnostics_app.html
+++ b/plinth/modules/diagnostics/templates/diagnostics_app.html
@@ -9,7 +9,7 @@
 
   <h2>{% trans "Diagnostic Results" %}</h2>
 
-  <h3>{% blocktrans %}App: {{ app_id }}{% endblocktrans %}</h3>
+  <h3>{% blocktrans %}App: {{ app_name }}{% endblocktrans %}</h3>
 
   {% if results %}
     {% include "diagnostics_results.html" with results=results %}
diff --git a/plinth/modules/diagnostics/views.py b/plinth/modules/diagnostics/views.py
index 097e9fc25..8d0a7a778 100644
--- a/plinth/modules/diagnostics/views.py
+++ b/plinth/modules/diagnostics/views.py
@@ -38,6 +38,7 @@ def diagnose_app(request, app_id):
         app = App.get(app_id)
     except KeyError:
         raise Http404('App does not exist')
+    app_name = app.info.name or app_id
 
     diagnosis = None
     diagnosis_exception = None
@@ -51,7 +52,7 @@ def diagnose_app(request, app_id):
     return TemplateResponse(
         request, 'diagnostics_app.html', {
             'title': _('Diagnostic Test'),
-            'app_id': app_id,
+            'app_name': app_name,
             'results': diagnosis,
             'exception': diagnosis_exception,
         })