diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 903d18e233..74b9330c1b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -17650,7 +17650,7 @@ namespace ts {
 
             const container = node.parent.kind === SyntaxKind.SourceFile ? <SourceFile>node.parent : <ModuleDeclaration>node.parent.parent;
             if (container.kind === SyntaxKind.ModuleDeclaration && !isAmbientModule(container)) {
-                error(node, Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
+                error(node, Diagnostics.A_default_export_can_only_be_used_in_an_ECMAScript_style_module);
                 return;
             }
             // Grammar checking
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index be4ee2fa07..29bea6c3d3 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -195,7 +195,7 @@
         "category": "Error",
         "code": 1062
     },
-    "An export assignment cannot be used in a namespace.": {
+    "A default export can only be used in an ECMAScript-style module.": {
         "category": "Error",
         "code": 1063
     },
diff --git a/tests/baselines/reference/parserExportAssignment5.errors.txt b/tests/baselines/reference/parserExportAssignment5.errors.txt
index 7b07e1d225..adef4b88f3 100644
--- a/tests/baselines/reference/parserExportAssignment5.errors.txt
+++ b/tests/baselines/reference/parserExportAssignment5.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts(2,5): error TS1063: An export assignment cannot be used in a namespace.
+tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts(2,5): error TS1063: A default export can only be used in an ECMAScript-style module.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment5.ts (1 errors) ====
     module M {
         export = A;
         ~~~~~~~~~~~
-!!! error TS1063: An export assignment cannot be used in a namespace.
+!!! error TS1063: A default export can only be used in an ECMAScript-style module.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserExportAssignment9.errors.txt b/tests/baselines/reference/parserExportAssignment9.errors.txt
new file mode 100644
index 0000000000..9fc978537a
--- /dev/null
+++ b/tests/baselines/reference/parserExportAssignment9.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment9.ts(2,3): error TS1063: A default export can only be used in an ECMAScript-style module.
+tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment9.ts(6,3): error TS1063: A default export can only be used in an ECMAScript-style module.
+
+
+==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment9.ts (2 errors) ====
+    namespace Foo {
+      export default foo;
+      ~~~~~~~~~~~~~~~~~~~
+!!! error TS1063: A default export can only be used in an ECMAScript-style module.
+    }
+    
+    module Bar {
+      export default bar;
+      ~~~~~~~~~~~~~~~~~~~
+!!! error TS1063: A default export can only be used in an ECMAScript-style module.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserExportAssignment9.js b/tests/baselines/reference/parserExportAssignment9.js
new file mode 100644
index 0000000000..2600ae629e
--- /dev/null
+++ b/tests/baselines/reference/parserExportAssignment9.js
@@ -0,0 +1,18 @@
+//// [parserExportAssignment9.ts]
+namespace Foo {
+  export default foo;
+}
+
+module Bar {
+  export default bar;
+}
+
+//// [parserExportAssignment9.js]
+var Foo;
+(function (Foo) {
+    export default foo;
+})(Foo || (Foo = {}));
+var Bar;
+(function (Bar) {
+    export default bar;
+})(Bar || (Bar = {}));
diff --git a/tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment9.ts b/tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment9.ts
new file mode 100644
index 0000000000..dc3aad8533
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment9.ts
@@ -0,0 +1,7 @@
+namespace Foo {
+  export default foo;
+}
+
+module Bar {
+  export default bar;
+}
\ No newline at end of file