diff --git a/apps/ui/templates/device.html b/apps/ui/templates/device.html
index 2ef1b03..f6e88ea 100644
--- a/apps/ui/templates/device.html
+++ b/apps/ui/templates/device.html
@@ -4,8 +4,6 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Gerät - Home Automation</title>
-    <script src="/static/types.js"></script>
-    <script src="/static/api-client.js"></script>
     <style>
         * {
             margin: 0;
@@ -291,7 +289,13 @@
     <script>
         // API configuration from backend
         window.API_BASE = '{{ api_base }}';
-
+    </script>
+    
+    <!-- Load API client AFTER API_BASE is set -->
+    <script src="/static/types.js"></script>
+    <script src="/static/api-client.js"></script>
+    
+    <script>
         // Get device ID from URL
         const pathParts = window.location.pathname.split('/');
         const deviceId = pathParts[pathParts.length - 1];
diff --git a/apps/ui/templates/room.html b/apps/ui/templates/room.html
index 133ab28..d1295d7 100644
--- a/apps/ui/templates/room.html
+++ b/apps/ui/templates/room.html
@@ -4,8 +4,6 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{{ room_name }} - Home Automation</title>
-    <script src="/static/types.js"></script>
-    <script src="/static/api-client.js"></script>
     <style>
         * {
             margin: 0;
@@ -208,7 +206,13 @@
     <script>
         // API configuration from backend
         window.API_BASE = '{{ api_base }}';
-
+    </script>
+    
+    <!-- Load API client AFTER API_BASE is set -->
+    <script src="/static/types.js"></script>
+    <script src="/static/api-client.js"></script>
+    
+    <script>
         // Get room name from URL
         const pathParts = window.location.pathname.split('/');
         const roomName = decodeURIComponent(pathParts[pathParts.length - 1]);
diff --git a/apps/ui/templates/rooms.html b/apps/ui/templates/rooms.html
index f93099a..d38f4fa 100644
--- a/apps/ui/templates/rooms.html
+++ b/apps/ui/templates/rooms.html
@@ -4,8 +4,6 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Räume - Home Automation</title>
-    <script src="/static/types.js"></script>
-    <script src="/static/api-client.js"></script>
     <style>
         * {
             margin: 0;
@@ -151,7 +149,13 @@
     <script>
         // API configuration from backend
         window.API_BASE = '{{ api_base }}';
-
+    </script>
+    
+    <!-- Load API client AFTER API_BASE is set -->
+    <script src="/static/types.js"></script>
+    <script src="/static/api-client.js"></script>
+    
+    <script>
         // Room icon mapping
         const roomIcons = {
             'wohnzimmer': '🛋️',