diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
index eaeaa269a..19f093a5d 100644
--- a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
+++ b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
@@ -1606,6 +1606,16 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=(?:'|\")(.*?)(?:'|\")>(
             }
             break;
         }
+        case MXEventTypePollEnd:
+        {
+            if (event.isEditEvent)
+            {
+                return nil;
+            }
+            
+            displayText = [VectorL10n pollTimelineEndedText];
+            break;
+        }
         case MXEventTypePollStart:
         {
             if (event.isEditEvent)