diff --git a/packages/theme-language-server-browser/package.json b/packages/theme-language-server-browser/package.json
index a3263fed5..286f06b53 100644
--- a/packages/theme-language-server-browser/package.json
+++ b/packages/theme-language-server-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shopify/theme-language-server-browser",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "CP Clermont <cp.clermont@shopify.com>",
@@ -27,7 +27,7 @@
     "type-check": "tsc --noEmit"
   },
   "dependencies": {
-    "@shopify/theme-language-server-common": "2.20.0",
+    "@shopify/theme-language-server-common": "2.20.1",
     "vscode-languageserver": "^8.0.2"
   }
 }
diff --git a/packages/theme-language-server-common/package.json b/packages/theme-language-server-common/package.json
index bd00b24d6..4fcc9355e 100644
--- a/packages/theme-language-server-common/package.json
+++ b/packages/theme-language-server-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shopify/theme-language-server-common",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "CP Clermont <cp.clermont@shopify.com>",
diff --git a/packages/theme-language-server-common/src/server/startServer.ts b/packages/theme-language-server-common/src/server/startServer.ts
index 6664d2393..e25b5b50b 100644
--- a/packages/theme-language-server-common/src/server/startServer.ts
+++ b/packages/theme-language-server-common/src/server/startServer.ts
@@ -98,6 +98,7 @@ export function startServer(
     jsonValidationSet,
     themeDocset: remoteThemeDocset,
     fetchMetafieldDefinitionsForURI,
+    augmentDocset = true,
   }: Dependencies,
 ) {
   const fs = new CachedFileSystem(injectedFs);
@@ -175,7 +176,9 @@ export function startServer(
   };
 
   // These are augmented here so that the caching is maintained over different runs.
-  const themeDocset = new AugmentedThemeDocset(remoteThemeDocset);
+  // Allow consumers to disable augmentation for vanilla liquid LSP
+  const themeDocset =
+    augmentDocset ? new AugmentedThemeDocset(remoteThemeDocset) : remoteThemeDocset;
   const cssLanguageService = new CSSLanguageService(documentManager);
   const runChecks = debounce(
     makeRunChecks(documentManager, diagnosticsManager, {
diff --git a/packages/theme-language-server-common/src/types.ts b/packages/theme-language-server-common/src/types.ts
index 57acb1420..9c36c79f0 100644
--- a/packages/theme-language-server-common/src/types.ts
+++ b/packages/theme-language-server-common/src/types.ts
@@ -98,6 +98,14 @@ export interface RequiredDependencies {
    * This should only be used in node environments; not on the browser.
    */
   fetchMetafieldDefinitionsForURI: (uri: URI) => Promise<void>;
+
+  /**
+   * Controls augmentation of the provided ThemeDocset.
+   *
+   * - true (default): wrap with AugmentedThemeDocset
+   * - false: use the provided ThemeDocset as-is
+   */
+  augmentDocset?: boolean;
 }
 
 export namespace ThemeGraphReferenceRequest {
diff --git a/packages/theme-language-server-node/package.json b/packages/theme-language-server-node/package.json
index a3b4011bc..41131686b 100644
--- a/packages/theme-language-server-node/package.json
+++ b/packages/theme-language-server-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shopify/theme-language-server-node",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "CP Clermont <cp.clermont@shopify.com>",
@@ -29,7 +29,7 @@
   "dependencies": {
     "@shopify/theme-check-docs-updater": "^3.23.0",
     "@shopify/theme-check-node": "^3.23.0",
-    "@shopify/theme-language-server-common": "2.20.0",
+    "@shopify/theme-language-server-common": "2.20.1",
     "glob": "^8.0.3",
     "node-fetch": "^2.6.11",
     "vscode-languageserver": "^8.0.2",