diff --git a/src/js/yunohost/controllers/apps.js b/src/js/yunohost/controllers/apps.js
index aa8d2c3d..a0ccf5b0 100644
--- a/src/js/yunohost/controllers/apps.js
+++ b/src/js/yunohost/controllers/apps.js
@@ -302,10 +302,11 @@
                 formatYunoHostStyleArguments(action.arguments, c.params);
 
                 // Multilingual description
-                action.description = (typeof action.description[y18n.locale] !== 'undefined') ?
-                                        action.description[y18n.locale] :
-                                        action.description['en']
-                                        ;
+                if (action.description && Array.isArray(action.description))
+                    action.description = (typeof action.description[y18n.locale] !== 'undefined') ?
+                                            action.description[y18n.locale] :
+                                            action.description['en']
+                                            ;
 
             });
 
diff --git a/src/views/app/app_actions.ms b/src/views/app/app_actions.ms
index f0b284db..07f8b4b2 100644
--- a/src/views/app/app_actions.ms
+++ b/src/views/app/app_actions.ms
@@ -17,7 +17,9 @@
         <h2 class="panel-title">{{name}}</h2>
     </div>
     <div class="panel-body">
+        {{#if description}}
         <p>{{description}}</p>
+        {{/if}}
         {{#if arguments}}
         {{#arguments}}
         <div class="form-group">