diff --git a/src/core/server/graph/tenant/loaders/Comments.ts b/src/core/server/graph/tenant/loaders/Comments.ts
index 01188d5e5..dc47c52de 100644
--- a/src/core/server/graph/tenant/loaders/Comments.ts
+++ b/src/core/server/graph/tenant/loaders/Comments.ts
@@ -50,7 +50,7 @@ const tagFilter = (tag?: GQLTAG): CommentConnectionInput["filter"] => {
 
 const queryFilter = (query?: string): CommentConnectionInput["filter"] => {
   if (query) {
-    return { $text: { $search: `"${query}"` } };
+    return { $text: { $search: JSON.stringify(query) } };
   }
 
   return {};
diff --git a/src/core/server/graph/tenant/loaders/Users.ts b/src/core/server/graph/tenant/loaders/Users.ts
index a1ecffcf0..7863ad677 100644
--- a/src/core/server/graph/tenant/loaders/Users.ts
+++ b/src/core/server/graph/tenant/loaders/Users.ts
@@ -27,7 +27,7 @@ const roleFilter = (role?: GQLUSER_ROLE): UserConnectionFilterInput => {
 
 const queryFilter = (query?: string): UserConnectionFilterInput => {
   if (query) {
-    return { $text: { $search: `"${query}"` } };
+    return { $text: { $search: JSON.stringify(query) } };
   }
 
   return {};