diff --git a/javascript/extractor/src/com/semmle/jcorn/Parser.java b/javascript/extractor/src/com/semmle/jcorn/Parser.java
index a248a82dd140..cb9af6c6822c 100644
--- a/javascript/extractor/src/com/semmle/jcorn/Parser.java
+++ b/javascript/extractor/src/com/semmle/jcorn/Parser.java
@@ -2296,9 +2296,9 @@ protected Identifier parseIdent(boolean liberal) {
           && (this.options.ecmaVersion() >= 6
               || inputSubstring(this.start, this.end).indexOf("\\") == -1))
         this.raiseRecoverable(this.start, "The keyword '" + this.value + "' is reserved");
-      if (!isPrivateField && this.inGenerator && this.value.equals("yield"))
+      if (!liberal && !isPrivateField && this.inGenerator && this.value.equals("yield"))
         this.raiseRecoverable(this.start, "Can not use 'yield' as identifier inside a generator");
-      if (!isPrivateField && this.inAsync && this.value.equals("await"))
+      if (!liberal && !isPrivateField && this.inAsync && this.value.equals("await"))
         this.raiseRecoverable(
             this.start, "Can not use 'await' as identifier inside an async function");
       name = String.valueOf(this.value);
diff --git a/javascript/ql/test/library-tests/AwaitPropertyName/AwaitPropertyName.expected b/javascript/ql/test/library-tests/AwaitPropertyName/AwaitPropertyName.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/javascript/ql/test/library-tests/AwaitPropertyName/AwaitPropertyName.ql b/javascript/ql/test/library-tests/AwaitPropertyName/AwaitPropertyName.ql
new file mode 100644
index 000000000000..939784b52eab
--- /dev/null
+++ b/javascript/ql/test/library-tests/AwaitPropertyName/AwaitPropertyName.ql
@@ -0,0 +1,4 @@
+import javascript
+
+from JSParseError err
+select err
diff --git a/javascript/ql/test/library-tests/AwaitPropertyName/options b/javascript/ql/test/library-tests/AwaitPropertyName/options
new file mode 100644
index 000000000000..13f987b19caf
--- /dev/null
+++ b/javascript/ql/test/library-tests/AwaitPropertyName/options
@@ -0,0 +1 @@
+semmle-extractor-options: --tolerate-parse-errors
diff --git a/javascript/ql/test/library-tests/AwaitPropertyName/tst.js b/javascript/ql/test/library-tests/AwaitPropertyName/tst.js
new file mode 100644
index 000000000000..4edc377402c0
--- /dev/null
+++ b/javascript/ql/test/library-tests/AwaitPropertyName/tst.js
@@ -0,0 +1,10 @@
+const pool = { await() { return 42; } };
+const generator = { yield() { return 42; } };
+
+async function issue22499() {
+  return await pool.await();
+}
+
+function* yieldPropertyName() {
+  return generator.yield();
+}