diff --git a/src/services/services.ts b/src/services/services.ts
index c9ba2cd6056..e58579e27f9 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -4628,7 +4628,8 @@ namespace ts {
             const symbolFlags = symbol.flags;
             let symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, symbolFlags, location);
             let hasAddedSymbolInfo: boolean;
-            const isThisExpression: boolean = location.kind === SyntaxKind.ThisKeyword && isExpression(location);
+            const isThisExpression = location.kind === SyntaxKind.ThisKeyword && isExpression(location);
+            const isConstructor = location.kind === SyntaxKind.ConstructorKeyword;
             let type: Type;
 
             // Class at constructor site need to be shown as constructor apart from property,method, vars
@@ -4639,7 +4640,12 @@ namespace ts {
                 }
 
                 let signature: Signature;
-                type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol, location);
+                type = isThisExpression
+                    ? typeChecker.getTypeAtLocation(location)
+                    : isConstructor
+                        // For constructor, get type of the class.
+                        ? typeChecker.getTypeOfSymbolAtLocation(symbol.parent, location)
+                        : typeChecker.getTypeOfSymbolAtLocation(symbol, location);
                 if (type) {
                     if (location.parent && location.parent.kind === SyntaxKind.PropertyAccessExpression) {
                         const right = (<PropertyAccessExpression>location.parent).name;
@@ -4737,9 +4743,7 @@ namespace ts {
                         if (functionDeclaration.kind === SyntaxKind.Constructor) {
                             // show (constructor) Type(...) signature
                             symbolKind = ScriptElementKind.constructorImplementationElement;
-                            // For a constructor, `type` will be unknown.
-                            const showSymbol = symbol.declarations[0].kind === SyntaxKind.Constructor ? symbol.parent : type.symbol;
-                            addPrefixForAnyFunctionOrVar(showSymbol, symbolKind);
+                            addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
                             // (function/method) symbol(..signature)
diff --git a/tests/cases/fourslash/findAllReferencesOfConstructor.ts b/tests/cases/fourslash/findAllReferencesOfConstructor.ts
index 15d002862a1..27c253b1356 100644
--- a/tests/cases/fourslash/findAllReferencesOfConstructor.ts
+++ b/tests/cases/fourslash/findAllReferencesOfConstructor.ts
@@ -39,5 +39,6 @@
 ////class d extends a.C { constructor() { [|super|](); }
 
 const ranges = test.ranges();
-verify.referencesOf(ranges[0], ranges);
-verify.referencesOf(ranges[1], ranges);
+for (const ctr of ranges.slice(0, 3)) {
+    verify.referencesOf(ctr, ranges);
+}
diff --git a/tests/cases/fourslash/findAllReferencesOfConstructor_badOverload.ts b/tests/cases/fourslash/findAllReferencesOfConstructor_badOverload.ts
new file mode 100644
index 00000000000..77479bad113
--- /dev/null
+++ b/tests/cases/fourslash/findAllReferencesOfConstructor_badOverload.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+////class C {
+////    [|constructor|](n: number);
+////    [|constructor|](){}
+////}
+
+verify.rangesReferenceEachOther();