diff --git a/artiq/frontend/artiq_dashboard.py b/artiq/frontend/artiq_dashboard.py
index 83bb6e8e4..17ec0527d 100755
--- a/artiq/frontend/artiq_dashboard.py
+++ b/artiq/frontend/artiq_dashboard.py
@@ -221,6 +221,12 @@ def main():
     atexit_register_coroutine(d_ttl_dds.stop, loop=loop)
 
     d_waveform = waveform.WaveformDock()
+    loop.run_until_complete(d_waveform.devices_sub.connect(args.server, args.port_notify))
+    atexit_register_coroutine(d_waveform.devices_sub.close, loop=loop)
+    for name in ["rpc_client", "receiver_client"]:
+        client = getattr(d_waveform, name)
+        loop.run_until_complete(client.start())
+        atexit_register_coroutine(client.close, loop=loop)
 
     d_schedule = schedule.ScheduleDock(
         rpc_clients["schedule"], sub_clients["schedule"])