diff --git a/src/services/signalRService.js b/src/services/signalRService.js
index 112e9f85..49ad0cc8 100644
--- a/src/services/signalRService.js
+++ b/src/services/signalRService.js
@@ -8,8 +8,8 @@ import showToast from "./toastService";
 import eventBus from "./eventBus";
 import { useSelector } from "react-redux";
 import { clearApiCacheKey } from "../slices/apiCacheSlice";
-const base_Url = process.env.VITE_BASE_URL;
-// const base_Url = "https://devapi.marcoaiot.com";
+import { BASE_URL } from "../utils/constants";
+const base_Url = BASE_URL;
 let connection = null;
 
 const targetPath = "";
diff --git a/src/utils/axiosClient.jsx b/src/utils/axiosClient.jsx
index d8b88a80..41a18609 100644
--- a/src/utils/axiosClient.jsx
+++ b/src/utils/axiosClient.jsx
@@ -3,8 +3,9 @@ import { useNavigate } from "react-router-dom";
 import axiosRetry from "axios-retry";
 import showToast from "../services/toastService";
 import { startSignalR, stopSignalR } from "../services/signalRService";
-const base_Url = process.env.VITE_BASE_URL;
-// const base_Url = "https://api.marcoaiot.com";
+import { BASE_URL } from "./constants";
+const base_Url = BASE_URL
+
 export const axiosClient = axios.create({
   baseURL: base_Url, // Your Web API URL
   withCredentials: false, // Required if the API uses cookies
diff --git a/src/utils/constants.jsx b/src/utils/constants.jsx
index a018c998..ef0000de 100644
--- a/src/utils/constants.jsx
+++ b/src/utils/constants.jsx
@@ -32,4 +32,7 @@ export const DIRECTORY_ADMIN = "4286a13b-bb40-4879-8c6d-18e9e393beda"
 
 export const DIRECTORY_MANAGER = "62668630-13ce-4f52-a0f0-db38af2230c5"
 
-export const DIRECTORY_USER = "0f919170-92d4-4337-abd3-49b66fc871bb"
\ No newline at end of file
+export const DIRECTORY_USER = "0f919170-92d4-4337-abd3-49b66fc871bb"
+
+export const BASE_URL = process.env.VITE_BASE_URL;
+// export const BASE_URL = "https://api.marcoaiot.com";
\ No newline at end of file