diff --git a/ElementX/Sources/Other/HTMLParsing/AttributedStringBuilder.swift b/ElementX/Sources/Other/HTMLParsing/AttributedStringBuilder.swift
index 5e8bc6039..24bbf07a2 100644
--- a/ElementX/Sources/Other/HTMLParsing/AttributedStringBuilder.swift
+++ b/ElementX/Sources/Other/HTMLParsing/AttributedStringBuilder.swift
@@ -153,7 +153,8 @@ struct AttributedStringBuilder: AttributedStringBuilderProtocol {
         
         var matches = MatrixEntityRegex.userIdentifierRegex.matches(in: string, options: [], range: range)
         matches.append(contentsOf: MatrixEntityRegex.roomIdentifierRegex.matches(in: string, options: [], range: range))
-        matches.append(contentsOf: MatrixEntityRegex.eventIdentifierRegex.matches(in: string, options: [], range: range))
+        // As of right now we do not handle event id links in any way so there is no need to add them as links
+//        matches.append(contentsOf: MatrixEntityRegex.eventIdentifierRegex.matches(in: string, options: [], range: range))
         matches.append(contentsOf: MatrixEntityRegex.roomAliasRegex.matches(in: string, options: [], range: range))
         matches.append(contentsOf: MatrixEntityRegex.linkRegex.matches(in: string, options: [], range: range))
         
diff --git a/UnitTests/Sources/AttributedStringBuilderTests.swift b/UnitTests/Sources/AttributedStringBuilderTests.swift
index c29f54dc2..a60fc3b7a 100644
--- a/UnitTests/Sources/AttributedStringBuilderTests.swift
+++ b/UnitTests/Sources/AttributedStringBuilderTests.swift
@@ -179,13 +179,14 @@ class AttributedStringBuilderTests: XCTestCase {
         checkMatrixEntityLinkIn(attributedString: attributedStringBuilder.fromHTML(string), expected: roomId)
         checkMatrixEntityLinkIn(attributedString: attributedStringBuilder.fromPlain(string), expected: roomId)
     }
-    
-    func testEventIdLink() {
-        let eventId = "$eventidentifier"
-        let string = "The event is \(eventId)."
-        checkMatrixEntityLinkIn(attributedString: attributedStringBuilder.fromHTML(string), expected: eventId)
-        checkMatrixEntityLinkIn(attributedString: attributedStringBuilder.fromPlain(string), expected: eventId)
-    }
+
+    // As of right now we do not handle event id links in any way so there is no need to add them as links
+//    func testEventIdLink() {
+//        let eventId = "$eventidentifier"
+//        let string = "The event is \(eventId)."
+//        checkMatrixEntityLinkIn(attributedString: attributedStringBuilder.fromHTML(string), expected: eventId)
+//        checkMatrixEntityLinkIn(attributedString: attributedStringBuilder.fromPlain(string), expected: eventId)
+//    }
     
     func testDefaultFont() {
         let htmlString = "<b>Test</b> <i>string</i>."
diff --git a/changelog.d/500.bugfix b/changelog.d/500.bugfix
new file mode 100644
index 000000000..10bb35868
--- /dev/null
+++ b/changelog.d/500.bugfix
@@ -0,0 +1 @@
+Fixed a bug that recognised any amount in dollars as an untappable link.
\ No newline at end of file