diff --git a/website/server/controllers/api-v3/groups.js b/website/server/controllers/api-v3/groups.js
index 7ffea80783..871e70d3c9 100644
--- a/website/server/controllers/api-v3/groups.js
+++ b/website/server/controllers/api-v3/groups.js
@@ -336,7 +336,11 @@ api.getGroups = {
     }
 
     if (req.query.search) {
-      filters.$text = { $search: req.query.search };
+      filters.$or = [];
+      const searchWords = req.query.search.split(' ').join('|');
+      const searchQuery = { $regex: new RegExp(`${searchWords}`, 'i') };
+      filters.$or.push({name: searchQuery});
+      filters.$or.push({description: searchQuery});
     }
 
     let results = await Group.getGroups({