diff --git a/packages/amazonq/src/lsp/client.ts b/packages/amazonq/src/lsp/client.ts
index 1373c026a9c..b198aabfd6f 100644
--- a/packages/amazonq/src/lsp/client.ts
+++ b/packages/amazonq/src/lsp/client.ts
@@ -92,7 +92,8 @@ export async function startLanguageServer(
                                 customization,
                                 optOutTelemetry: getOptOutPreference() === 'OPTOUT',
                                 projectContext: {
-                                    enableLocalIndexing: CodeWhispererSettings.instance.isLocalIndexEnabled(),
+                                    // TODO: we might need another setting to control the actual indexing
+                                    enableLocalIndexing: true,
                                     enableGpuAcceleration: CodeWhispererSettings.instance.isLocalIndexGPUEnabled(),
                                     indexWorkerThreads: CodeWhispererSettings.instance.getIndexWorkerThreads(),
                                     localIndexing: {