diff --git a/html/sensors.html b/html/sensors.html
index 241a013..6323602 100755
--- a/html/sensors.html
+++ b/html/sensors.html
@@ -319,11 +319,27 @@ $.ajax({
 
     mainConfig = response; // Store for later use
 
-    //device name_side bar
-    const elements = document.querySelectorAll('.sideBar_sensorName');
-      elements.forEach((element) => {
-          element.innerText = response.deviceName;
-      });
+    // Function to update sidebar device name
+    function updateSidebarDeviceName(deviceName) {
+      const elements = document.querySelectorAll('.sideBar_sensorName');
+      if (elements.length > 0) {
+        elements.forEach((element) => {
+          element.innerText = deviceName;
+        });
+        console.log("Device name updated in sidebar:", deviceName);
+      }
+    }
+
+    // Update device name immediately and with retries to handle async sidebar loading
+    if (response.deviceName) {
+      updateSidebarDeviceName(response.deviceName);
+      // Retry after delays to catch async sidebar load
+      setTimeout(() => updateSidebarDeviceName(response.deviceName), 100);
+      setTimeout(() => updateSidebarDeviceName(response.deviceName), 500);
+
+      // Set page title
+      document.title = response.deviceName;
+    }
 
     // After getting main config, create sensor cards
     createSensorCards(mainConfig);
diff --git a/html/wifi.html b/html/wifi.html
index 6c28779..32ace1a 100755
--- a/html/wifi.html
+++ b/html/wifi.html
@@ -298,16 +298,28 @@ function get_internet(){
 
              //get device Name
              const deviceName = data.deviceName;
-           
-           const elements = document.querySelectorAll('.sideBar_sensorName');
-           elements.forEach((element) => {
-               element.innerText = deviceName;
-           });
 
-                 //device name html page title
-      if (response.deviceName) {
-      document.title = response.deviceName;
-    }
+           // Function to update sidebar device name
+           function updateSidebarDeviceName(deviceName) {
+             const elements = document.querySelectorAll('.sideBar_sensorName');
+             if (elements.length > 0) {
+               elements.forEach((element) => {
+                 element.innerText = deviceName;
+               });
+               console.log("Device name updated in sidebar:", deviceName);
+             }
+           }
+
+           // Update device name immediately and with retries to handle async sidebar loading
+           if (deviceName) {
+             updateSidebarDeviceName(deviceName);
+             // Retry after delays to catch async sidebar load
+             setTimeout(() => updateSidebarDeviceName(deviceName), 100);
+             setTimeout(() => updateSidebarDeviceName(deviceName), 500);
+
+             //device name html page title
+             document.title = deviceName;
+           }
 
 
             //get wifi connection status