diff --git a/Riot/Utils/EventFormatter.m b/Riot/Utils/EventFormatter.m
index b8e156c8d..f30939e67 100644
--- a/Riot/Utils/EventFormatter.m
+++ b/Riot/Utils/EventFormatter.m
@@ -88,6 +88,12 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
             
             NSMutableAttributedString *result = [[NSMutableAttributedString alloc] initWithAttributedString:imageString];
             [result appendAttributedString:attrString];
+            
+            if (error)
+            {
+                *error = MXKEventFormatterErrorNone;
+            }
+            
             return result;
         }
     }