diff --git a/ElementX/Sources/Other/Pills/MessageText.swift b/ElementX/Sources/Other/Pills/MessageText.swift
index 3bc00a09a7..35a9d1c779 100644
--- a/ElementX/Sources/Other/Pills/MessageText.swift
+++ b/ElementX/Sources/Other/Pills/MessageText.swift
@@ -81,7 +81,6 @@ struct MessageText: UIViewRepresentable {
         textView.adjustsFontForContentSizeCategory = true
 
         // Required to allow tapping links
-        // We disable selection at delegate level
         textView.isSelectable = true
         textView.isUserInteractionEnabled = true
         
@@ -135,10 +134,6 @@ struct MessageText: UIViewRepresentable {
             self.openURLAction = openURLAction
         }
         
-        func textViewDidChangeSelection(_ textView: UITextView) {
-            textView.selectedTextRange = nil
-        }
-        
         func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
             switch interaction {
             case .invokeDefaultAction:
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
index 71e1f296b8..f4331d4c8f 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
@@ -128,9 +128,6 @@ struct TimelineItemBubbledStylerView<Content: View>: View {
     
     var messageBubble: some View {
         styledContent
-            .onTapGesture(count: 2) {
-                context.send(viewAction: .displayEmojiPicker(itemID: timelineItem.id))
-            }
             .onTapGesture {
                 context.send(viewAction: .itemTapped(itemID: timelineItem.id))
             }
diff --git a/changelog.d/2924.change b/changelog.d/2924.change
new file mode 100644
index 0000000000..9ba6cc369e
--- /dev/null
+++ b/changelog.d/2924.change
@@ -0,0 +1 @@
+Allow timeline messages text selection on both the Mac and on iOS (not on long press but a double tap)
\ No newline at end of file