diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
index 16880972b69..c5cb3f87fc5 100644
--- a/src/compiler/visitor.ts
+++ b/src/compiler/visitor.ts
@@ -269,7 +269,7 @@ namespace ts {
                     nodesVisitor((<PropertyDeclaration>node).modifiers, visitor, isModifier),
                     visitNode((<PropertyDeclaration>node).name, visitor, isPropertyName),
                     // QuestionToken and ExclamationToken is uniqued in Property Declaration and the signature of 'updateProperty' is that too
-                    (visitNode((<PropertyDeclaration>node).questionToken, tokenVisitor, isToken), visitNode((<PropertyDeclaration>node).exclamationToken, tokenVisitor, isToken)),
+                    visitNode((<PropertyDeclaration>node).questionToken || (<PropertyDeclaration>node).exclamationToken, tokenVisitor, isToken),
                     visitNode((<PropertyDeclaration>node).type, visitor, isTypeNode),
                     visitNode((<PropertyDeclaration>node).initializer, visitor, isExpression));