diff --git a/main/calendar/agenda.lib.php b/main/calendar/agenda.lib.php
index 3f7e70e838..4a5be9e0de 100755
--- a/main/calendar/agenda.lib.php
+++ b/main/calendar/agenda.lib.php
@@ -2318,6 +2318,9 @@ class Agenda
 
         if (!empty($messages)) {
             $messages = implode('<br /> ', $messages);
+        } else {
+            $messages = get_lang('NoAgendaItems');
+                    
         }
 
         return $messages;