diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index b4372f32c56..782435381a4 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -858,12 +858,6 @@ export default {
 			const possibleMentions = response.data.ocs.data
 
 			possibleMentions.forEach(possibleMention => {
-				// Wrap mention ids with spaces in quotes.
-				if (possibleMention.id.indexOf(' ') !== -1
-					|| possibleMention.id.indexOf('/') !== -1) {
-					possibleMention.id = '"' + possibleMention.id + '"'
-				}
-
 				// Set icon for candidate mentions that are not for users.
 				if (possibleMention.source === 'calls') {
 					possibleMention.icon = 'icon-group-forced-white'