diff --git a/packages/tailwindcss-language-server/src/language/rewriting.test.ts b/packages/tailwindcss-language-server/src/language/rewriting.test.ts
index 33596a2e..d3874418 100644
--- a/packages/tailwindcss-language-server/src/language/rewriting.test.ts
+++ b/packages/tailwindcss-language-server/src/language/rewriting.test.ts
@@ -69,20 +69,28 @@ test('@theme', () => {
   let input = [
     //
     '@theme {',
-    '  color: red;',
+    '  --color: red;',
+    '  --font-*: initial;',
+    '  --font-weight-*: initial;',
     '}',
     '@theme inline reference static default {',
-    '  color: red;',
+    '  --color: red;',
+    '  --font-*: initial;',
+    '  --font-weight-*: initial;',
     '}',
   ]
 
   let output = [
     //
     '.placeholder {', // wrong
-    '  color: red;',
+    '  --color: red;',
+    '  --font-_: initial;',
+    '  --font-weight-_: initial;',
     '}',
     '.placeholder                                 {', // wrong
-    '  color: red;',
+    '  --color: red;',
+    '  --font-_: initial;',
+    '  --font-weight-_: initial;',
     '}',
   ]
 
diff --git a/packages/tailwindcss-language-server/src/language/rewriting.ts b/packages/tailwindcss-language-server/src/language/rewriting.ts
index 4dc7a429..4a983ad1 100644
--- a/packages/tailwindcss-language-server/src/language/rewriting.ts
+++ b/packages/tailwindcss-language-server/src/language/rewriting.ts
@@ -74,7 +74,7 @@ export function rewriteCss(css: string) {
   })
 
   // Replace `--some-var-*` with `--some-var-_`
-  css = css.replace(/--([a-zA-Z0-9]+)-[*]/g, '--$1_')
+  css = css.replace(/--([a-zA-Z0-9-]+)-[*]/g, '--$1-_')
 
   return css
 }
diff --git a/packages/tailwindcss-language-server/tests/css/css-server.test.ts b/packages/tailwindcss-language-server/tests/css/css-server.test.ts
index 02146ccc..1ee3246b 100644
--- a/packages/tailwindcss-language-server/tests/css/css-server.test.ts
+++ b/packages/tailwindcss-language-server/tests/css/css-server.test.ts
@@ -219,6 +219,7 @@ defineTest({
         @theme {
           --color-primary: #333;
           --leading-*: initial;
+          --font-weight-*: initial;
         }
       `,
     })
@@ -235,7 +236,7 @@ defineTest({
           uri: '{workspace:default}/file-1.css',
           range: {
             start: { line: 1, character: 0 },
-            end: { line: 4, character: 1 },
+            end: { line: 5, character: 1 },
           },
         },
       },
diff --git a/packages/vscode-tailwindcss/CHANGELOG.md b/packages/vscode-tailwindcss/CHANGELOG.md
index 9da256e0..2f2ce33c 100644
--- a/packages/vscode-tailwindcss/CHANGELOG.md
+++ b/packages/vscode-tailwindcss/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Prerelease
 
 - Don't throw when requiring() packages that resolve to a path containing a `#` character ([#1235](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1235))
+- Fix syntax error when resetting multi-word theme key namespaces ([#1237](https://github.com/tailwindlabs/tailwindcss-intellisense/pull/1237))
 
 # 0.14.7