diff --git a/app/views/conversations/_conversation.haml b/app/views/conversations/_conversation.haml
index bd3cf7c95470c2e668abc6c30a6b9b4991afaa94..56424335490a34f90b10141c526224f5c6bfafff 100644
--- a/app/views/conversations/_conversation.haml
+++ b/app/views/conversations/_conversation.haml
@@ -19,7 +19,8 @@
     .last_author
       .timestamp
         = t('ago', :time =>  time_ago_in_words(conversation.updated_at))
-      = authors[conversation.id].name
+      - if not authors[conversation.id].nil?
+        = authors[conversation.id].name
 
       - if conversation.participants.size > 2
         %span.participant_count