diff --git a/packages/babel-parser/src/parser/statement.js b/packages/babel-parser/src/parser/statement.js
index d2981c2400..22cc9b24a0 100644
--- a/packages/babel-parser/src/parser/statement.js
+++ b/packages/babel-parser/src/parser/statement.js
@@ -1866,9 +1866,17 @@ export default class StatementParser extends ExpressionParser {
         // Named exports
         for (const specifier of node.specifiers) {
           this.checkDuplicateExports(specifier, specifier.exported.name);
-          // check if export is defined
           // $FlowIgnore
           if (!isFrom && specifier.local) {
+            // check for keywords used as local names
+            this.checkReservedWord(
+              specifier.local.name,
+              specifier.local.start,
+              true,
+              false,
+            );
+            // check if export is defined
+            // $FlowIgnore
             this.scope.checkLocalExport(specifier.local);
           }
         }
@@ -1954,7 +1962,6 @@ export default class StatementParser extends ExpressionParser {
   parseExportSpecifiers(): Array<N.ExportSpecifier> {
     const nodes = [];
     let first = true;
-    let needsFrom;
 
     // export { x, y as z } [from '...']
     this.expect(tt.braceL);
@@ -1967,22 +1974,14 @@ export default class StatementParser extends ExpressionParser {
         if (this.eat(tt.braceR)) break;
       }
 
-      const isDefault = this.match(tt._default);
-      if (isDefault && !needsFrom) needsFrom = true;
-
       const node = this.startNode();
-      node.local = this.parseIdentifier(isDefault);
+      node.local = this.parseIdentifier(true);
       node.exported = this.eatContextual("as")
         ? this.parseIdentifier(true)
         : node.local.__clone();
       nodes.push(this.finishNode(node, "ExportSpecifier"));
     }
 
-    // https://github.com/ember-cli/ember-cli/pull/3739
-    if (needsFrom && !this.isContextual("from")) {
-      this.unexpected();
-    }
-
     return nodes;
   }
 
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/export-from-valid-reserved-word/input.js b/packages/babel-parser/test/fixtures/es2015/modules/export-from-valid-reserved-word/input.js
new file mode 100644
index 0000000000..0248bf7b6b
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/modules/export-from-valid-reserved-word/input.js
@@ -0,0 +1 @@
+export { if } from 'foo'
diff --git a/packages/babel-parser/test/fixtures/es2015/modules/export-from-valid-reserved-word/output.json b/packages/babel-parser/test/fixtures/es2015/modules/export-from-valid-reserved-word/output.json
new file mode 100644
index 0000000000..5455a52879
--- /dev/null
+++ b/packages/babel-parser/test/fixtures/es2015/modules/export-from-valid-reserved-word/output.json
@@ -0,0 +1,122 @@
+{
+  "type": "File",
+  "start": 0,
+  "end": 24,
+  "loc": {
+    "start": {
+      "line": 1,
+      "column": 0
+    },
+    "end": {
+      "line": 1,
+      "column": 24
+    }
+  },
+  "program": {
+    "type": "Program",
+    "start": 0,
+    "end": 24,
+    "loc": {
+      "start": {
+        "line": 1,
+        "column": 0
+      },
+      "end": {
+        "line": 1,
+        "column": 24
+      }
+    },
+    "sourceType": "module",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExportNamedDeclaration",
+        "start": 0,
+        "end": 24,
+        "loc": {
+          "start": {
+            "line": 1,
+            "column": 0
+          },
+          "end": {
+            "line": 1,
+            "column": 24
+          }
+        },
+        "specifiers": [
+          {
+            "type": "ExportSpecifier",
+            "start": 9,
+            "end": 11,
+            "loc": {
+              "start": {
+                "line": 1,
+                "column": 9
+              },
+              "end": {
+                "line": 1,
+                "column": 11
+              }
+            },
+            "local": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                },
+                "identifierName": "if"
+              },
+              "name": "if"
+            },
+            "exported": {
+              "type": "Identifier",
+              "start": 9,
+              "end": 11,
+              "loc": {
+                "start": {
+                  "line": 1,
+                  "column": 9
+                },
+                "end": {
+                  "line": 1,
+                  "column": 11
+                },
+                "identifierName": "if"
+              },
+              "name": "if"
+            }
+          }
+        ],
+        "source": {
+          "type": "StringLiteral",
+          "start": 19,
+          "end": 24,
+          "loc": {
+            "start": {
+              "line": 1,
+              "column": 19
+            },
+            "end": {
+              "line": 1,
+              "column": 24
+            }
+          },
+          "extra": {
+            "rawValue": "foo",
+            "raw": "'foo'"
+          },
+          "value": "foo"
+        },
+        "declaration": null
+      }
+    ],
+    "directives": []
+  }
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-default-token/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-default-token/options.json
index e806dd7b3a..b6ce2c43af 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-default-token/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-default-token/options.json
@@ -1,3 +1,4 @@
 {
-  "throws": "Unexpected token (1:17)"
-}
+  "sourceType": "module",
+  "throws": "Unexpected token, expected \";\" (1:17)"
+}
\ No newline at end of file
diff --git a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-named-default/options.json b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-named-default/options.json
index 4c07f39d17..e03d273fdc 100644
--- a/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-named-default/options.json
+++ b/packages/babel-parser/test/fixtures/esprima/es2015-export-declaration/invalid-export-named-default/options.json
@@ -1,3 +1,4 @@
 {
-  "throws": "Unexpected token (1:16)"
-}
+  "sourceType": "module",
+  "throws": "Unexpected keyword 'default' (1:8)"
+}
\ No newline at end of file