diff --git a/src/massaStation/MassaStationAccount.ts b/src/massaStation/MassaStationAccount.ts
index 61b907f..0e44861 100644
--- a/src/massaStation/MassaStationAccount.ts
+++ b/src/massaStation/MassaStationAccount.ts
@@ -1,8 +1,5 @@
 import { getRequest, postRequest } from './RequestHandler';
-import {
-  MASSA_STATION_URL,
-  MASSA_STATION_ACCOUNTS_URL,
-} from './MassaStationWallet';
+import { getMSWalletUrl, MASSA_STATION_URL } from './MassaStationWallet';
 import {
   argsToBase64,
   base64ToByteArray,
@@ -117,7 +114,7 @@ export class MassaStationAccount implements Provider {
     };
 
     const res = await postRequest<MSAccountSignResp>(
-      `${MASSA_STATION_ACCOUNTS_URL}/${this.accountName}/signMessage`,
+      `${getMSWalletUrl()}accounts/${this.accountName}/signMessage`,
       signData,
     );
 
@@ -155,7 +152,7 @@ export class MassaStationAccount implements Provider {
     };
 
     const res = await postRequest<MSSendOperationResp>(
-      `${MASSA_STATION_ACCOUNTS_URL}/${this.accountName}/rolls`,
+      `${getMSWalletUrl()}accounts/${this.accountName}/rolls`,
       body,
     );
 
@@ -193,7 +190,7 @@ export class MassaStationAccount implements Provider {
     };
 
     const res = await postRequest<MSSendOperationResp>(
-      `${MASSA_STATION_ACCOUNTS_URL}/${this.accountName}/transfer`,
+      `${getMSWalletUrl()}accounts/${this.accountName}/transfer`,
       body,
     );
 
diff --git a/src/massaStation/MassaStationWallet.ts b/src/massaStation/MassaStationWallet.ts
index 4a3af32..436f5cb 100644
--- a/src/massaStation/MassaStationWallet.ts
+++ b/src/massaStation/MassaStationWallet.ts
@@ -21,8 +21,18 @@ export const MASSA_STATION_URL = 'https://station.massa/';
 /**
  * The MassaStation accounts url
  */
-export const MASSA_STATION_ACCOUNTS_URL = `${MASSA_STATION_URL}plugin/massa-labs/massa-wallet/api/accounts`;
 
+export function getMSWalletUrl(): string {
+  // This is a hack to detect that MS wallet is working in standalone mode
+  if (
+    typeof import.meta !== 'undefined' &&
+    (import.meta as any)?.env?.VITE_ENV
+  ) {
+    console.log((import.meta as any).env.VITE_BASE_API);
+    return `http://localhost:8080/api/`;
+  }
+  return `${MASSA_STATION_URL}plugin/massa-labs/massa-wallet/api/`;
+}
 /**
  * Events emitted by MassaStation
  */
@@ -51,7 +61,7 @@ export class MassaStationWallet implements Wallet {
   }
 
   public async accounts(): Promise<MassaStationAccount[]> {
-    const res = await getRequest<MSAccountsResp>(MASSA_STATION_ACCOUNTS_URL);
+    const res = await getRequest<MSAccountsResp>(getMSWalletUrl() + 'accounts');
 
     if (res.isError) {
       throw res.error;
@@ -69,7 +79,7 @@ export class MassaStationWallet implements Wallet {
     publicKey: string,
     privateKey: string,
   ): Promise<void> {
-    const res = await putRequest(MASSA_STATION_ACCOUNTS_URL, {
+    const res = await putRequest(getMSWalletUrl() + 'accounts', {
       publicKey,
       privateKey,
     });
@@ -81,7 +91,7 @@ export class MassaStationWallet implements Wallet {
   public async deleteAccount(address: string): Promise<void> {
     // get all accounts and find the account to delete
     const allAccounts = await getRequest<MSAccountsResp>(
-      MASSA_STATION_ACCOUNTS_URL,
+      getMSWalletUrl() + 'accounts',
     );
 
     if (allAccounts.isError) throw allAccounts.error;
@@ -95,7 +105,7 @@ export class MassaStationWallet implements Wallet {
     }
 
     const res = await deleteRequest<unknown>(
-      `${MASSA_STATION_ACCOUNTS_URL}/${accountToDelete.nickname}`,
+      `${getMSWalletUrl()}accounts/${accountToDelete.nickname}`,
     );
 
     if (res.isError) {
@@ -121,7 +131,7 @@ export class MassaStationWallet implements Wallet {
    */
   public async generateNewAccount(name: string): Promise<MassaStationAccount> {
     const response = await postRequest<MSAccount>(
-      MASSA_STATION_ACCOUNTS_URL + '/' + name,
+      getMSWalletUrl() + 'accounts/' + name,
       {},
     );