diff --git a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/RoomMessageBubbleBackgroundView.swift b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/RoomMessageBubbleBackgroundView.swift
index 496cd0a4a..da79211b2 100644
--- a/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/RoomMessageBubbleBackgroundView.swift
+++ b/Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/RoomMessageBubbleBackgroundView.swift
@@ -77,7 +77,11 @@ class RoomMessageBubbleBackgroundView: UIView {
 
 // MARK: - TimestampDisplayable
 extension RoomMessageBubbleBackgroundView: TimestampDisplayable {
+    
     func addTimestampView(_ timestampView: UIView) {
+        
+        self.removeTimestampView()
+        
         self.addTimestampView(timestampView, rightMargin: 8.0, bottomMargin: 4.0)
         self.timestampView = timestampView
     }