diff --git a/core/base-service/legacy-request-handler.js b/core/base-service/legacy-request-handler.js
index a6b8d72b5f1ec3bcf34453881fd9d436aad3a293..e12170226d9adb9d06b3a6c4b85a420ce52265c6 100644
--- a/core/base-service/legacy-request-handler.js
+++ b/core/base-service/legacy-request-handler.js
@@ -198,7 +198,9 @@ function handleRequest(cacheHeaderConfig, handlerOptions) {
       },
       cachingRequest
     )
+    // eslint-disable-next-line promise/prefer-await-to-then
     if (result && result.catch) {
+      // eslint-disable-next-line promise/prefer-await-to-then
       result.catch(err => {
         throw err
       })
diff --git a/core/service-test-runner/service-tester.js b/core/service-test-runner/service-tester.js
index a8130b7738e9a6b7b3ee8400d7456ed9c0817ea8..4aa282f8535c4a007606af027816484653fdc9b9 100644
--- a/core/service-test-runner/service-tester.js
+++ b/core/service-test-runner/service-tester.js
@@ -84,7 +84,7 @@ class ServiceTester {
       .before(() => {
         this.beforeEach()
       })
-      // eslint-disable-next-line mocha/prefer-arrow-callback
+      // eslint-disable-next-line mocha/prefer-arrow-callback, promise/prefer-await-to-then
       .finally(function () {
         // `this` is the IcedFrisby instance.
         let responseBody
diff --git a/package-lock.json b/package-lock.json
index b943d49a0bd2e948ab0c8ff61434003e491af34b..8d4edb5ace1b7bc41888de6b3aa58e7bf7f8cc1f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -95,7 +95,7 @@
         "eslint-plugin-mocha": "^8.1.0",
         "eslint-plugin-no-extension-in-require": "^0.2.0",
         "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-promise": "^4.3.1",
+        "eslint-plugin-promise": "^5.1.0",
         "eslint-plugin-react": "^7.23.2",
         "eslint-plugin-react-hooks": "^4.2.0",
         "eslint-plugin-sort-class-members": "^1.11.0",
@@ -11480,12 +11480,15 @@
       }
     },
     "node_modules/eslint-plugin-promise": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.3.1.tgz",
-      "integrity": "sha512-bY2sGqyptzFBDLh/GMbAxfdJC+b0f23ME63FOE4+Jao0oZ3E1LEwFtWJX/1pGMJLiTtrSSern2CRM/g+dfc0eQ==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz",
+      "integrity": "sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0"
       }
     },
     "node_modules/eslint-plugin-react": {
@@ -45497,10 +45500,11 @@
       }
     },
     "eslint-plugin-promise": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.3.1.tgz",
-      "integrity": "sha512-bY2sGqyptzFBDLh/GMbAxfdJC+b0f23ME63FOE4+Jao0oZ3E1LEwFtWJX/1pGMJLiTtrSSern2CRM/g+dfc0eQ==",
-      "dev": true
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz",
+      "integrity": "sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng==",
+      "dev": true,
+      "requires": {}
     },
     "eslint-plugin-react": {
       "version": "7.23.2",
diff --git a/package.json b/package.json
index ef2bcf371c90d0f061fd2beb212738300d408c5d..136bd1792399f3b0551880d59660ec47b1bbc0a4 100644
--- a/package.json
+++ b/package.json
@@ -183,7 +183,7 @@
     "eslint-plugin-mocha": "^8.1.0",
     "eslint-plugin-no-extension-in-require": "^0.2.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-react": "^7.23.2",
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-plugin-sort-class-members": "^1.11.0",
diff --git a/services/suggest.js b/services/suggest.js
index ac1c6893939a27273b18977adb12a6c861f954b6..432c0000019748695f19ad8b79e127e191fcad0a 100644
--- a/services/suggest.js
+++ b/services/suggest.js
@@ -193,6 +193,7 @@ function setRoutes(allowedOrigin, githubApiProvider, server) {
       .then(suggestions => {
         end({ suggestions })
       })
+      // eslint-disable-next-line promise/prefer-await-to-then
       .catch(err => {
         end({ suggestions: [], err })
       })