diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
index 85513e8719f..e5914d10060 100644
--- a/src/compiler/declarationEmitter.ts
+++ b/src/compiler/declarationEmitter.ts
@@ -896,6 +896,9 @@ namespace ts {
                 if (isSupportedExpressionWithTypeArguments(node)) {
                     emitTypeWithNewGetSymbolAccessibilityDiagnostic(node, getHeritageClauseVisibilityError);
                 }
+                else if (!isImplementsList && node.expression.kind === SyntaxKind.NullKeyword) {
+                    write("null");
+                }
 
                 function getHeritageClauseVisibilityError(symbolAccesibilityResult: SymbolAccessiblityResult): SymbolAccessibilityDiagnostic {
                     let diagnosticMessage: DiagnosticMessage;
diff --git a/tests/baselines/reference/declFileClassExtendsNull.js b/tests/baselines/reference/declFileClassExtendsNull.js
new file mode 100644
index 00000000000..0d50b320592
--- /dev/null
+++ b/tests/baselines/reference/declFileClassExtendsNull.js
@@ -0,0 +1,23 @@
+//// [declFileClassExtendsNull.ts]
+
+class ExtendsNull extends null {
+}
+
+//// [declFileClassExtendsNull.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var ExtendsNull = (function (_super) {
+    __extends(ExtendsNull, _super);
+    function ExtendsNull() {
+        _super.apply(this, arguments);
+    }
+    return ExtendsNull;
+})(null);
+
+
+//// [declFileClassExtendsNull.d.ts]
+declare class ExtendsNull extends null {
+}
diff --git a/tests/baselines/reference/declFileClassExtendsNull.symbols b/tests/baselines/reference/declFileClassExtendsNull.symbols
new file mode 100644
index 00000000000..e86276faad8
--- /dev/null
+++ b/tests/baselines/reference/declFileClassExtendsNull.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/declFileClassExtendsNull.ts ===
+
+class ExtendsNull extends null {
+>ExtendsNull : Symbol(ExtendsNull, Decl(declFileClassExtendsNull.ts, 0, 0))
+}
diff --git a/tests/baselines/reference/declFileClassExtendsNull.types b/tests/baselines/reference/declFileClassExtendsNull.types
new file mode 100644
index 00000000000..bbd43d99c0d
--- /dev/null
+++ b/tests/baselines/reference/declFileClassExtendsNull.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/declFileClassExtendsNull.ts ===
+
+class ExtendsNull extends null {
+>ExtendsNull : ExtendsNull
+>null : null
+}
diff --git a/tests/cases/compiler/declFileClassExtendsNull.ts b/tests/cases/compiler/declFileClassExtendsNull.ts
new file mode 100644
index 00000000000..d21fd5d3805
--- /dev/null
+++ b/tests/cases/compiler/declFileClassExtendsNull.ts
@@ -0,0 +1,5 @@
+// @target: ES5
+// @declaration: true
+
+class ExtendsNull extends null {
+}
\ No newline at end of file