diff --git a/artiq/dashboard/waveform.py b/artiq/dashboard/waveform.py
index 43d8e7b2b..9f1d58a1a 100644
--- a/artiq/dashboard/waveform.py
+++ b/artiq/dashboard/waveform.py
@@ -852,13 +852,12 @@ class WaveformDock(QtWidgets.QDockWidget):
         channel_list = comm_analyzer.get_channel_list(self._ddb)
         self._channel_model.clear()
         self._channel_model.update(channel_list)
-        for name, desc in self._ddb.items():
-            if name == "core_analyzer":
-                logger.info("coreanalyzer exists")
-                addr = desc["host"]
-                port = desc.get("port_proxy", 1385)
-                port_control = desc.get("port_proxy_control", 1386)
-        if addr is not None:
+        desc = self._ddb.get("core_analyzer")
+        if desc is not None:
+            logger.info("desc found")
+            addr = desc["host"]
+            port = desc.get("port_proxy", 1385)
+            port_control = desc.get("port_proxy_control", 1386)
             self.proxy_client.update_address(addr, port, port_control)
 
     def init_ddb(self, ddb):