diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index e3f4f6523fb..481d20e91bd 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -948,7 +948,7 @@ namespace ts {
                     token = findPrecedingToken(token.getFullStart(), sourceFile);
                     if (!token || !isIdentifier(token)) return undefined;
                     if (!remainingLessThanTokens) {
-                        return { called: token, nTypeArguments };
+                        return isDeclarationName(token) ? undefined : { called: token, nTypeArguments };
                     }
                     remainingLessThanTokens--;
                     break;
diff --git a/tests/cases/fourslash/signatureHelpOnDeclaration.ts b/tests/cases/fourslash/signatureHelpOnDeclaration.ts
new file mode 100644
index 00000000000..7fc68174383
--- /dev/null
+++ b/tests/cases/fourslash/signatureHelpOnDeclaration.ts
@@ -0,0 +1,6 @@
+/// <reference path='fourslash.ts' />
+
+////function f</**/
+////x
+
+verify.noSignatureHelp("");