diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 71187b20960..312ea42eefb 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -4785,8 +4785,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                 // emit name if
                 // - node has a name
-                // - this is default export and target is not ES6 (for ES6 `export default` does not need to be compiled downlevel)                
-                if ((node.name || (node.flags & NodeFlags.Default && languageVersion < ScriptTarget.ES6)) && !thisNodeIsDecorated) {
+                // - this is default export with static initializers
+                if ((node.name || (node.flags & NodeFlags.Default && staticProperties.length > 0)) && !thisNodeIsDecorated) {
                     write(" ");
                     emitDeclarationName(node);
                 }
@@ -5645,8 +5645,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             /*
-             * Some bundlers (SystemJS builder) sometimes want to rename dependencies. 
-             * Here we check if alternative name was provided for a given moduleName and return it if possible. 
+             * Some bundlers (SystemJS builder) sometimes want to rename dependencies.
+             * Here we check if alternative name was provided for a given moduleName and return it if possible.
              */
             function tryRenameExternalModule(moduleName: LiteralExpression): string {
                 if (currentSourceFile.renamedDependencies && hasProperty(currentSourceFile.renamedDependencies, moduleName.text)) {
@@ -7074,7 +7074,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         return shouldEmitEnumDeclaration(<EnumDeclaration>node);
                 }
 
-                // If the node is emitted in specialized fashion, dont emit comments as this node will handle 
+                // If the node is emitted in specialized fashion, dont emit comments as this node will handle
                 // emitting comments when emitting itself
                 Debug.assert(!isSpecializedCommentHandling(node));
 
diff --git a/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.js b/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.js
new file mode 100644
index 00000000000..3acb89b8696
--- /dev/null
+++ b/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.js
@@ -0,0 +1,9 @@
+//// [exportDefaultClassWithStaticPropertyAssignmentsInES6.ts]
+export default class {
+    static z: string = "Foo";
+}
+
+//// [exportDefaultClassWithStaticPropertyAssignmentsInES6.js]
+export default class default_1 {
+}
+default_1.z = "Foo";
diff --git a/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.symbols b/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.symbols
new file mode 100644
index 00000000000..6d08eb93d92
--- /dev/null
+++ b/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/conformance/es6/classDeclaration/exportDefaultClassWithStaticPropertyAssignmentsInES6.ts ===
+export default class {
+    static z: string = "Foo";
+>z : Symbol(default.z, Decl(exportDefaultClassWithStaticPropertyAssignmentsInES6.ts, 0, 22))
+}
diff --git a/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.types b/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.types
new file mode 100644
index 00000000000..657e0301f83
--- /dev/null
+++ b/tests/baselines/reference/exportDefaultClassWithStaticPropertyAssignmentsInES6.types
@@ -0,0 +1,6 @@
+=== tests/cases/conformance/es6/classDeclaration/exportDefaultClassWithStaticPropertyAssignmentsInES6.ts ===
+export default class {
+    static z: string = "Foo";
+>z : string
+>"Foo" : string
+}
diff --git a/tests/cases/conformance/es6/classDeclaration/exportDefaultClassWithStaticPropertyAssignmentsInES6.ts b/tests/cases/conformance/es6/classDeclaration/exportDefaultClassWithStaticPropertyAssignmentsInES6.ts
new file mode 100644
index 00000000000..485fbdb011d
--- /dev/null
+++ b/tests/cases/conformance/es6/classDeclaration/exportDefaultClassWithStaticPropertyAssignmentsInES6.ts
@@ -0,0 +1,4 @@
+// @target:es6
+export default class {
+    static z: string = "Foo";
+}
\ No newline at end of file