diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index fd1cfef86a9..12e6461c28b 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -570,17 +570,17 @@ namespace ts {
             //  ---------------------------------------------------------------------
             //  TypeScript                      | Javascript
             //  ---------------------------------------------------------------------
-            //  @dec                            | let C_1;
-            //  class C {                       | let C = C_1 = class C {
-            //    static x() { return C.y; }    |   static x() { return C_1.y; }
-            //    static y = 1;                 | }
+            //  @dec                            | let C_1 = class C {
+            //  class C {                       |   static x() { return C_1.y; }
+            //    static x() { return C.y; }    | }
+            //    static y = 1;                 | let C = C_1;
             //  }                               | C.y = 1;
             //                                  | C = C_1 = __decorate([dec], C);
             //  ---------------------------------------------------------------------
-            //  @dec                            | let C_1;
-            //  export class C {                | let C = C_1 = class C {
-            //    static x() { return C.y; }    |   static x() { return C_1.y; }
-            //    static y = 1;                 | }
+            //  @dec                            | let C_1 = class C {
+            //  export class C {                |   static x() { return C_1.y; }
+            //    static x() { return C.y; }    | }
+            //    static y = 1;                 | let C = C_1;
             //  }                               | C.y = 1;
             //                                  | C = C_1 = __decorate([dec], C);
             //                                  | export { C };
@@ -612,10 +612,10 @@ namespace ts {
             //  ---------------------------------------------------------------------
             //  TypeScript                      | Javascript
             //  ---------------------------------------------------------------------
-            //  @dec                            | let C_1;
-            //  export default class C {        | let C = C_1 = class C {
-            //    static x() { return C.y; }    |   static x() { return C_1.y; }
-            //    static y = 1;                 | }
+            //  @dec                            | let C_1 = class C {
+            //  export default class C {        |   static x() { return C_1.y; }
+            //    static x() { return C.y; }    | }
+            //    static y = 1;                 | let C = C_1;
             //  }                               | C.y = 1;
             //                                  | C = C_1 = __decorate([dec], C);
             //                                  | export default C;
@@ -647,35 +647,19 @@ namespace ts {
                 enableSubstitutionForDecoratedClasses();
                 decoratedClassAlias = createUniqueName(node.name && !isGeneratedIdentifier(node.name) ? node.name.text : "default");
                 decoratedClassAliases[getOriginalNodeId(node)] = decoratedClassAlias;
-
-                // We emit the class alias as a `let` declaration here so that it has the same
-                // TDZ as the class.
-
-                //  let ${decoratedClassAlias};
-                addNode(statements,
-                    createVariableStatement(
-                        /*modifiers*/ undefined,
-                        createLetDeclarationList([
-                            createVariableDeclaration(decoratedClassAlias)
-                        ])
-                    )
-                );
-
-                //  ${decoratedClassAlias} = ${classExpression}
-                classExpression = createAssignment(
-                    decoratedClassAlias,
-                    classExpression,
-                    /*location*/ location);
             }
 
-            //  let ${name} = ${classExpression};
+            const declaredName = getDeclarationName(node, /*allowComments*/ true);
+
+            //  let ${name} = ${classExpression} where name is either declaredName if the class doesn't contain self-reference
+            //                                         or decoratedClassAlias if the class contain self-reference.
             addNode(statements,
                 setOriginalNode(
                     createVariableStatement(
                         /*modifiers*/ undefined,
                         createLetDeclarationList([
                             createVariableDeclaration(
-                                getDeclarationName(node, /*allowComments*/ true),
+                                decoratedClassAlias || declaredName,
                                 /*type*/ undefined,
                                 classExpression
                             )
@@ -686,6 +670,29 @@ namespace ts {
                 )
             );
 
+            if (decoratedClassAlias) {
+                // We emit the class alias as a `let` declaration here so that it has the same
+                // TDZ as the class.
+
+                // let ${declareName} = ${decoratedClassAlias}
+                addNode(statements,
+                    setOriginalNode(
+                        createVariableStatement(
+                            /*modifiers*/ undefined,
+                            createLetDeclarationList([
+                                createVariableDeclaration(
+                                    declaredName,
+                                    /*type*/ undefined,
+                                    decoratedClassAlias
+                                )
+                            ]),
+                            /*location*/ location
+                        ),
+                        /*original*/ node
+                    )
+                );
+            }
+
             return decoratedClassAlias;
         }
 
diff --git a/tests/baselines/reference/decoratorOnClass5.es6.js b/tests/baselines/reference/decoratorOnClass5.es6.js
index 58c5f0d4f29..e34740d6517 100644
--- a/tests/baselines/reference/decoratorOnClass5.es6.js
+++ b/tests/baselines/reference/decoratorOnClass5.es6.js
@@ -16,10 +16,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-let C_1;
-let C = C_1 = class C {
+let C_1 = class C {
     static x() { return C_1.y; }
 };
+let C = C_1;
 C.y = 1;
 C = C_1 = __decorate([
     dec
diff --git a/tests/baselines/reference/decoratorOnClass6.es6.js b/tests/baselines/reference/decoratorOnClass6.es6.js
index d8330a57ef6..fff39d85916 100644
--- a/tests/baselines/reference/decoratorOnClass6.es6.js
+++ b/tests/baselines/reference/decoratorOnClass6.es6.js
@@ -16,10 +16,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-let C_1;
-let C = C_1 = class C {
+let C_1 = class C {
     static x() { return C_1.y; }
 };
+let C = C_1;
 C.y = 1;
 C = C_1 = __decorate([
     dec
diff --git a/tests/baselines/reference/decoratorOnClass7.es6.js b/tests/baselines/reference/decoratorOnClass7.es6.js
index 3ffd0f1574f..7f111ea4abf 100644
--- a/tests/baselines/reference/decoratorOnClass7.es6.js
+++ b/tests/baselines/reference/decoratorOnClass7.es6.js
@@ -16,10 +16,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-let C_1;
-let C = C_1 = class C {
+let C_1 = class C {
     static x() { return C_1.y; }
 };
+let C = C_1;
 C.y = 1;
 C = C_1 = __decorate([
     dec