diff --git a/html/admin.html b/html/admin.html
index 1351b16..2874a4b 100755
--- a/html/admin.html
+++ b/html/admin.html
@@ -379,6 +379,7 @@
 <script src="assets/js/bootstrap.bundle.js"></script>
 <!-- i18n translation system -->
 <script src="assets/js/i18n.js"></script>
+<script src="assets/js/topbar-logo.js"></script>
 
 <script>
  document.addEventListener('DOMContentLoaded', function () {
diff --git a/html/assets/js/topbar-logo.js b/html/assets/js/topbar-logo.js
new file mode 100644
index 0000000..75df120
--- /dev/null
+++ b/html/assets/js/topbar-logo.js
@@ -0,0 +1,19 @@
+// Switch topbar logo based on device_type config
+// Uses MutationObserver to detect when topbar is dynamically loaded
+(function() {
+    var observer = new MutationObserver(function() {
+        var logo = document.getElementById('topbar-logo');
+        if (logo) {
+            observer.disconnect();
+            fetch('launcher.php?type=get_config_sqlite')
+                .then(function(r) { return r.json(); })
+                .then(function(config) {
+                    if (config.device_type === 'moduleair_pro') {
+                        logo.src = 'assets/img/logoModuleAir.png';
+                    }
+                })
+                .catch(function() {});
+        }
+    });
+    observer.observe(document.body || document.documentElement, { childList: true, subtree: true });
+})();
diff --git a/html/database.html b/html/database.html
index 958491b..616449e 100755
--- a/html/database.html
+++ b/html/database.html
@@ -153,6 +153,7 @@
 <script src="assets/js/bootstrap.bundle.js"></script>
 <!-- i18n translation system -->
 <script src="assets/js/i18n.js"></script>
+<script src="assets/js/topbar-logo.js"></script>
 
 <script>
  document.addEventListener('DOMContentLoaded', function () {
diff --git a/html/index.html b/html/index.html
index 8201768..52f57fc 100755
--- a/html/index.html
+++ b/html/index.html
@@ -110,6 +110,7 @@
 <script src="assets/js/bootstrap.bundle.js"></script>
 <!-- i18n translation system -->
 <script src="assets/js/i18n.js"></script>
+<script src="assets/js/topbar-logo.js"></script>
 
 <script>
  document.addEventListener('DOMContentLoaded', function () {
diff --git a/html/logs.html b/html/logs.html
index 524957b..03a3c5e 100755
--- a/html/logs.html
+++ b/html/logs.html
@@ -92,6 +92,7 @@
 <script src="assets/js/bootstrap.bundle.js"></script>
 <!-- i18n translation system -->
 <script src="assets/js/i18n.js"></script>
+<script src="assets/js/topbar-logo.js"></script>
 
 <script>
  document.addEventListener('DOMContentLoaded', function () {
diff --git a/html/map.html b/html/map.html
index 93ad113..2cfda32 100755
--- a/html/map.html
+++ b/html/map.html
@@ -117,6 +117,7 @@
 <script src="assets/jquery/jquery-3.7.1.min.js"></script>
 <!-- Link Bootstrap JS and Popper.js locally -->
 <script src="assets/js/bootstrap.bundle.js"></script>
+<script src="assets/js/topbar-logo.js"></script>
 
 <script>
  document.addEventListener('DOMContentLoaded', function () {
diff --git a/html/saraR4.html b/html/saraR4.html
index dbfba94..9315819 100755
--- a/html/saraR4.html
+++ b/html/saraR4.html
@@ -518,6 +518,7 @@
 <script src="assets/js/bootstrap.bundle.js"></script>
 <!-- i18n translation system -->
 <script src="assets/js/i18n.js"></script>
+<script src="assets/js/topbar-logo.js"></script>
 
 <script>
 document.addEventListener('DOMContentLoaded', function () {
diff --git a/html/sensors.html b/html/sensors.html
index b732afc..7e39e83 100755
--- a/html/sensors.html
+++ b/html/sensors.html
@@ -66,6 +66,7 @@
 <script src="assets/js/bootstrap.bundle.js"></script>
 <!-- i18n translation system -->
 <script src="assets/js/i18n.js"></script>
+<script src="assets/js/topbar-logo.js"></script>
 
 <script>
  document.addEventListener('DOMContentLoaded', function () {
diff --git a/html/terminal.html b/html/terminal.html
index 24b7a95..df1ea87 100644
--- a/html/terminal.html
+++ b/html/terminal.html
@@ -175,6 +175,7 @@
   <script src="assets/jquery/jquery-3.7.1.min.js"></script>
   <!-- Link Bootstrap JS and Popper.js locally -->
   <script src="assets/js/bootstrap.bundle.js"></script>
+  <script src="assets/js/topbar-logo.js"></script>
 
   <script>
     document.addEventListener('DOMContentLoaded', function () {
diff --git a/html/topbar.html b/html/topbar.html
index 7629c5f..b44da8a 100755
--- a/html/topbar.html
+++ b/html/topbar.html
@@ -4,16 +4,6 @@
         <a class="navbar-brand" href="#">
             <img src="assets/img/LogoNebuleAir.png" alt="Logo" height="30" class="d-inline-block align-text-top" id="topbar-logo">
         </a>
-        <script>
-            fetch('launcher.php?type=get_config_sqlite')
-                .then(r => r.json())
-                .then(config => {
-                    if (config.device_type === 'moduleair_pro') {
-                        document.getElementById('topbar-logo').src = 'assets/img/logoModuleAir.png';
-                    }
-                })
-                .catch(() => {});
-        </script>
         <div class="d-flex">
             <button class="btn btn-outline-light d-md-none me-2" type="button" data-bs-toggle="offcanvas" data-bs-target="#sidebarOffcanvas" aria-controls="sidebarOffcanvas" aria-label="Toggle Sidebar">☰</button>
 
diff --git a/html/wifi.html b/html/wifi.html
index dc16978..0d2b935 100755
--- a/html/wifi.html
+++ b/html/wifi.html
@@ -119,6 +119,7 @@
 <script src="assets/js/bootstrap.bundle.js"></script>
 <!-- i18n translation system -->
 <script src="assets/js/i18n.js"></script>
+<script src="assets/js/topbar-logo.js"></script>
 
 <script>
  document.addEventListener('DOMContentLoaded', function () {