diff --git a/packages/typescript-plugin/src/language-service/completions.ts b/packages/typescript-plugin/src/language-service/completions.ts
index b03b28da4..515f8b986 100644
--- a/packages/typescript-plugin/src/language-service/completions.ts
+++ b/packages/typescript-plugin/src/language-service/completions.ts
@@ -40,6 +40,13 @@ export function decorateCompletions(
                     }
                     return c;
                 });
+
+                if (completions.optionalReplacementSpan) {
+                    completions.optionalReplacementSpan = {
+                        ...completions.optionalReplacementSpan,
+                        start: toOriginalPos(completions.optionalReplacementSpan.start).pos
+                    };
+                }
             }
         }