diff --git a/ee/app/api-enterprise/server/canned-responses.js b/ee/app/api-enterprise/server/canned-responses.js
index 63ba4068cf751..a8d2a3a46da87 100644
--- a/ee/app/api-enterprise/server/canned-responses.js
+++ b/ee/app/api-enterprise/server/canned-responses.js
@@ -29,10 +29,8 @@ API.v1.addRoute('canned-responses', { authRequired: true }, {
 			departmentId,
 			userId: this.userId,
 			createdBy,
-			sort,
-			count,
 			options: {
-				sort: sort || { shortcut: -1 },
+				sort,
 				offset,
 				count,
 				fields,
diff --git a/ee/app/api-enterprise/server/lib/canned-responses.js b/ee/app/api-enterprise/server/lib/canned-responses.js
index 23717fece5de7..8b5120bb71383 100644
--- a/ee/app/api-enterprise/server/lib/canned-responses.js
+++ b/ee/app/api-enterprise/server/lib/canned-responses.js
@@ -68,7 +68,7 @@ export async function findAllCannedResponsesFilter({ userId, shortcut, text, sco
 
 	const cursor = CannedResponse.find({
 		...shortcut && { shortcut },
-		...text && { $or: [{ name: filter }] },
+		...text && { $or: [{ shortcut: filter }, { text: filter }] },
 		...scope && { scope },
 		...createdBy && { 'createdBy.username': createdBy },
 		...tags.length && {