diff --git a/web/blueprints/infrastructure/__init__.py b/web/blueprints/infrastructure/__init__.py
index 0e13c7250..fb971e9cb 100644
--- a/web/blueprints/infrastructure/__init__.py
+++ b/web/blueprints/infrastructure/__init__.py
@@ -129,7 +129,7 @@ def switches_json() -> ResponseValue:
                     btn_class="btn-link",
                 ),
             )
-            for switch in Switch.q.all()
+            for switch in Switch.q.options(joinedload(Switch.host)).all()
         ]
     ).model_dump()