diff --git a/src/services/completions.ts b/src/services/completions.ts
index 11f92c3d4eb..75b0d3a1c1d 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -338,7 +338,12 @@ namespace ts.Completions {
     ): CompletionEntry | undefined {
         let insertText: string | undefined;
         let replacementSpan: TextSpan | undefined;
+
         const insertQuestionDot = origin && originIsNullableMember(origin);
+        if (insertQuestionDot && preferences.includeAutomaticOptionalChainCompletions === false) {
+            return undefined;
+        }
+
         const useBraces = origin && originIsSymbolMember(origin) || needsConvertPropertyAccess;
         if (origin && originIsThisType(origin)) {
             insertText = needsConvertPropertyAccess