diff --git a/apps/ui/static/api-client.js b/apps/ui/static/api-client.js
index 26a0a52..b72d306 100644
--- a/apps/ui/static/api-client.js
+++ b/apps/ui/static/api-client.js
@@ -73,6 +73,10 @@ class HomeAutomationClient {
         return await this.fetch(this.api('/devices'));
     }
 
+    async getDevice() {
+        return await this.fetch(this.api(`/devices/${deviceId}`));
+    }
+
     /**
      * Get current state of a specific device
      * @param {string} deviceId - Device ID
diff --git a/apps/ui/templates/device.html b/apps/ui/templates/device.html
index 6907325..0d133d0 100644
--- a/apps/ui/templates/device.html
+++ b/apps/ui/templates/device.html
@@ -324,11 +324,10 @@
             try {
                 // Load device info using API client
                 // NEW: Use new endpoints for device info and layout
-                deviceData = await window.apiClient.getDeviceState(deviceId);
+                const deviceData = await window.apiClient.getDevice(deviceId);
+                deviceState = await window.apiClient.getDeviceState(deviceId);
                 const layoutInfo = await window.apiClient.getDeviceLayout(deviceId);
                 roomName = layoutInfo.room;
-                // deviceState is now the result of getDeviceState
-                deviceState = deviceData;
 
                 // Update header
                 document.getElementById('device-icon').textContent = deviceIcons[deviceData.type] || '📱';