diff --git a/.eslintrc.js b/.eslintrc.js
index 6e2559df33..9406526714 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -29,6 +29,7 @@ module.exports = {
     "spaced-comment": ["warn", "always", { line: { markers: ["/ <reference"] } }],
     "import/no-cycle": "warn",
     "simple-import-sort/sort": "warn",
+    "@typescript-eslint/await-thenable": "warn",
     "@typescript-eslint/explicit-function-return-type": ["warn", { allowExpressions: true }],
     "@typescript-eslint/no-empty-function": "off",
     "@typescript-eslint/no-empty-interface": "off",
diff --git a/tslint.json b/tslint.json
index 0b99ca10e5..3d2da501c4 100644
--- a/tslint.json
+++ b/tslint.json
@@ -4,7 +4,7 @@
   "jsRules": {},
   "rules": {
     "array-type": [true, "array"],
-    "await-promise": true,
+    "await-promise": false,
     "callable-types": false,
     "comment-format": [true, "check-space"],
     "curly": false,