diff --git a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/CompletionSuggestionServiceProtocol.swift b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/CompletionSuggestionServiceProtocol.swift
index 6102d33a3..76d066bf0 100644
--- a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/CompletionSuggestionServiceProtocol.swift
+++ b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/CompletionSuggestionServiceProtocol.swift
@@ -69,7 +69,7 @@ struct SuggestionItem: Identifiable, Equatable {
     var subtitle: String? {
         switch suggestionType {
         case .allUsers:
-            return nil
+            return PillConstants.atRoom
         case .user(let user):
             return user.displayName == nil ? nil : user.id
         case .room(let room):
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPad-en-GB.png
index d6b046011..7e9be09c1 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e19ea504637c4aefa97fb4588c1731bb077fb825ba67fa4cfe1263722a9d13e2
-size 80213
+oid sha256:5dee0c33b33df47adcd32a89d9158f2bc5fb0def3a94e9cc445286be5f92b954
+size 81934
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPad-pseudo.png
index 7938ff341..870579f17 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dab315a14ac8d0214c38ed83b4dd618311b90340b7f3a5b0e53c25fb1a83f2de
-size 80559
+oid sha256:b1104ec5d17a446b0fe5e6f4e4edc0dd20b29934428a43384e4e3d081339c4d1
+size 82355
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPhone-16-en-GB.png
index 83f2b40c5..3c0103ddc 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4762b524a5d07f3dc8523b33ca2f724a48bf8c9c6153b317f74069e22870d8d
-size 39035
+oid sha256:f5e631e06bc81e4bc3c0bb2a8902defbf0ebba837b8e98780315e1ce75fdc7e6
+size 40991
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPhone-16-pseudo.png
index a80a445b3..fc3593ebd 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mentionSuggestionItemView.All-users-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9c3c27bc47a307caee04d14dc733be9ed81407e9850012d351de55f75a84e40
-size 40647
+oid sha256:da42d2eb81d6c031262c837f80bedce87b2f19b6da9733b18d58c63671e650a9
+size 42526