diff --git a/go.mod b/go.mod
index 6f3da8a62..1af517193 100644
--- a/go.mod
+++ b/go.mod
@@ -49,7 +49,7 @@ require (
 	github.com/prometheus/client_golang v1.16.0
 	github.com/russolsen/transit v0.0.0-20180705123435-0794b4c4505a
 	github.com/status-im/doubleratchet v3.0.0+incompatible
-	github.com/status-im/markdown v0.0.0-20231114210825-6c2d15b5dc57
+	github.com/status-im/markdown v0.0.0-20240404192634-b7e33c6ac3d4
 	github.com/status-im/migrate/v4 v4.6.2-status.3
 	github.com/status-im/mvds v0.0.27-0.20240111144448-92d364e4be82
 	github.com/status-im/rendezvous v1.3.7
diff --git a/go.sum b/go.sum
index 554673e42..0fcdcefde 100644
--- a/go.sum
+++ b/go.sum
@@ -1997,8 +1997,8 @@ github.com/status-im/gomoji v1.1.3-0.20220213022530-e5ac4a8732d4/go.mod h1:hmpnZ
 github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
 github.com/status-im/keycard-go v0.0.0-20200402102358-957c09536969 h1:Oo2KZNP70KE0+IUJSidPj/BFS/RXNHmKIJOdckzml2E=
 github.com/status-im/keycard-go v0.0.0-20200402102358-957c09536969/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
-github.com/status-im/markdown v0.0.0-20231114210825-6c2d15b5dc57 h1:AuJFXERIFVzUjf9rrTb8vamFubB6Ks/e8aUasDr4pOM=
-github.com/status-im/markdown v0.0.0-20231114210825-6c2d15b5dc57/go.mod h1:5rjPyv3KffPNVbFjnsVy0NGj9+JeW40WvXLdxH1VKuE=
+github.com/status-im/markdown v0.0.0-20240404192634-b7e33c6ac3d4 h1:KBeXtOoisXjiSCkNVmZcq15kK4NmSi4p1hyZeUcT5dY=
+github.com/status-im/markdown v0.0.0-20240404192634-b7e33c6ac3d4/go.mod h1:5rjPyv3KffPNVbFjnsVy0NGj9+JeW40WvXLdxH1VKuE=
 github.com/status-im/migrate/v4 v4.6.2-status.3 h1:Khwjb59NzniloUr5i9s9AtkEyqBbQFt1lkoAu66sAu0=
 github.com/status-im/migrate/v4 v4.6.2-status.3/go.mod h1:c/kc90n47GZu/58nnz1OMLTf7uE4Da4gZP5qmU+A/v8=
 github.com/status-im/mvds v0.0.27-0.20240111144448-92d364e4be82 h1:A7jtwOlDMUGUPx5tTwUPewMoIprvo9oN9kU0H1CP+FQ=
diff --git a/vendor/github.com/status-im/markdown/parser/inline.go b/vendor/github.com/status-im/markdown/parser/inline.go
index 428b7f7ce..24c088ac5 100644
--- a/vendor/github.com/status-im/markdown/parser/inline.go
+++ b/vendor/github.com/status-im/markdown/parser/inline.go
@@ -181,7 +181,7 @@ func statusTag(p *Parser, data []byte, offset int) (int, ast.Node) {
 
 	i := 1
 	for i < n {
-		if isSpace(data[i]) {
+		if isValidTerminatingMentionChar(data[i]) {
 			break
 		}
 		if !isValidStatusTagChar(data[i]) {
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 71aff937b..d28af764f 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -924,7 +924,7 @@ github.com/status-im/go-multiaddr-ethv4
 # github.com/status-im/keycard-go v0.0.0-20200402102358-957c09536969
 ## explicit
 github.com/status-im/keycard-go/derivationpath
-# github.com/status-im/markdown v0.0.0-20231114210825-6c2d15b5dc57
+# github.com/status-im/markdown v0.0.0-20240404192634-b7e33c6ac3d4
 ## explicit; go 1.12
 github.com/status-im/markdown
 github.com/status-im/markdown/ast