diff --git a/packages/tailwindcss-language-server/src/server.ts b/packages/tailwindcss-language-server/src/server.ts
index 5b52879d573ba7a4436ca67d6273184eb95ffdb7..d286c211af1ecfd37d2f23816fbf030a6d8ad093 100644
--- a/packages/tailwindcss-language-server/src/server.ts
+++ b/packages/tailwindcss-language-server/src/server.ts
@@ -980,11 +980,11 @@       for (let { dispose } of disposables) {
         dispose()
       }
     },
-    async onUpdateSettings(settings: any): Promise<void> {
+    onUpdateSettings(settings: any): void {
       documentSettingsCache.clear()
       let previousExclude =
         state.editor.globalSettings.tailwindCSS.files?.exclude ?? DEFAULT_FILES_EXCLUDE
-      state.editor.globalSettings = await state.editor.getConfiguration()
+      state.editor.globalSettings = settings
       if (!equal(previousExclude, settings.tailwindCSS.files?.exclude ?? DEFAULT_FILES_EXCLUDE)) {
         tryInit()
       } else {
diff --git a/packages/vscode-tailwindcss/src/extension.ts b/packages/vscode-tailwindcss/src/extension.ts
index 72b5c4b8e67617e6f70e9b090d65014d65bb6bbc..1d5ea430210d34122d098b0752f7a7c5df5a3f48 100755
--- a/packages/vscode-tailwindcss/src/extension.ts
+++ b/packages/vscode-tailwindcss/src/extension.ts
@@ -88,15 +88,12 @@ function getGlobalExcludePatterns(scope: ConfigurationScope): string[] {
   return Object.entries(Workspace.getConfiguration('files', scope).get('exclude'))
     .filter(([, value]) => value === true)
     .map(([key]) => key)
-    .filter(Boolean)
 }
 
 function getExcludePatterns(scope: ConfigurationScope): string[] {
   return [
     ...getGlobalExcludePatterns(scope),
-    ...(<string[]>Workspace.getConfiguration('tailwindCSS', scope).get('files.exclude')).filter(
-      Boolean
-    ),
+    ...(<string[]>Workspace.getConfiguration('tailwindCSS', scope).get('files.exclude')),
   ]
 }
 
@@ -112,12 +109,12 @@ 
   return false
 }
 
-function mergeExcludes(settings: WorkspaceConfiguration, scope: ConfigurationScope): any {
+function mergeExcludes(settings: WorkspaceConfiguration, scope: ConfigurationScope) {
   return {
     ...settings,
     files: {
       ...settings.files,
-      exclude: getExcludePatterns(scope),
+      exclude: [...getGlobalExcludePatterns(scope), ...settings.files.exclude],
     },
   }
 }