diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellDecorator.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellDecorator.swift
index 2ea6ab381..5f42192a6 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellDecorator.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomTimelineCellDecorator.swift
@@ -208,6 +208,13 @@ class BubbleRoomTimelineCellDecorator: PlainRoomTimelineCellDecorator {
             return false
         }
         
+        switch cellData.cellDataTag {
+        case .location:
+            return true
+        default:
+            break
+        }
+        
         switch firstEvent.eventType {
         case .roomMessage:
             if let messageTypeString = firstEvent.content["msgtype"] as? String {