diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 1c41be84ba7..d5518eee3da 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -1016,7 +1016,17 @@ namespace ts {
                             }
                         }
                         break;
-
+                    case SyntaxKind.ExpressionWithTypeArguments:
+                        if (lastLocation === (<ExpressionWithTypeArguments>location).expression && (<HeritageClause>location.parent).token === SyntaxKind.ExtendsKeyword) {
+                            const container = location.parent.parent;
+                            if (isClassLike(container) && (result = lookup(getSymbolOfNode(container).members, name, meaning & SymbolFlags.Type))) {
+                                if (nameNotFoundMessage) {
+                                    error(errorLocation, Diagnostics.Base_class_expressions_cannot_reference_class_type_parameters);
+                                }
+                                return undefined;
+                            }
+                        }
+                        break;
                     // It is not legal to reference a class's own type parameters from a computed property name that
                     // belongs to the class. For example:
                     //
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 77e7f7e7b62..049483fdb8f 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1912,6 +1912,10 @@
         "category": "Error",
         "code": 2560
     },
+    "Base class expressions cannot reference class type parameters.": {
+        "category": "Error",
+        "code": 2561
+    },
     "JSX element attributes type '{0}' may not be a union type.": {
         "category": "Error",
         "code": 2600