diff --git a/client/src/extension.ts b/client/src/extension.ts
index e4bea0d..f0a09b4 100644
--- a/client/src/extension.ts
+++ b/client/src/extension.ts
@@ -6,6 +6,8 @@ import * as addonManager from './addon_manager/registration';
 import luadoc from "../3rd/vscode-lua-doc/extension.js";
 
 export function activate(context: vscode.ExtensionContext) {
+    // Register and activate addon manager first to initialize storagePath
+    addonManager.activate(context);
     languageserver.activate(context);
 
     const luaDocContext = {
@@ -18,9 +20,6 @@ export function activate(context: vscode.ExtensionContext) {
     luadoc.activate(luaDocContext);
     psi.activate(context);
 
-    // Register and activate addon manager
-    addonManager.activate(context);
-
     return {
         async reportAPIDoc(params: unknown) {
             await languageserver.reportAPIDoc(params);
diff --git a/client/src/languageserver.ts b/client/src/languageserver.ts
index 11deafb..d288e66 100644
--- a/client/src/languageserver.ts
+++ b/client/src/languageserver.ts
@@ -21,6 +21,7 @@ import {
     ExecuteCommandRequest,
     TransportKind,
 } from 'vscode-languageclient/node';
+import { getStorageUri } from './addon_manager/config';
 
 export let defaultClient: LuaClient | null;
 let outputChannel: vscode.OutputChannel | undefined;
@@ -162,7 +163,7 @@ class LuaClient extends Disposable {
                 codeLensViewReferences: true,
                 fixIndents: true,
                 languageConfiguration: true,
-                storagePath: this.context.globalStorageUri.fsPath,
+                storagePath: getStorageUri(this.context).fsPath,
             },
             middleware: {
                 provideHover: async () => undefined,