diff --git a/src/yunohost/diagnosis.py b/src/yunohost/diagnosis.py
index 93ece21fc..5666afb07 100644
--- a/src/yunohost/diagnosis.py
+++ b/src/yunohost/diagnosis.py
@@ -449,9 +449,8 @@ class Diagnoser():
     @staticmethod
     def get_description(id_):
         key = "diagnosis_description_" + id_
-        descr = m18n.n(key)
         # If no description available, fallback to id
-        return descr if descr != key else id_
+        return m18n.n(key) if m18n.key_exists(key) else id_
 
     @staticmethod
     def i18n(report, force_remove_html_tags=False):
diff --git a/src/yunohost/service.py b/src/yunohost/service.py
index 347932add..211d7bf56 100644
--- a/src/yunohost/service.py
+++ b/src/yunohost/service.py
@@ -352,14 +352,11 @@ def _get_and_format_service_status(service, infos):
 
     # If no description was there, try to get it from the .json locales
     if not description:
-        translation_key = "service_description_%s" % service
-        description = m18n.n(translation_key)
 
-        # If descrption is still equal to the translation key,
-        # that mean that we don't have a translation for this string
-        # that's the only way to test for that for now
-        # if we don't have it, uses the one provided by systemd
-        if description == translation_key:
+        translation_key = "service_description_%s" % service
+        if m18n.key_exists(translation_key):
+            description = m18n.key_exists(translation_key)
+        else:
             description = str(raw_status.get("Description", ""))
 
     output = {