diff --git a/client/src/pages/AdminPage.jsx b/client/src/pages/AdminPage.jsx
index cf4b62e..b1ca7c2 100644
--- a/client/src/pages/AdminPage.jsx
+++ b/client/src/pages/AdminPage.jsx
@@ -296,6 +296,12 @@ function MatchAdminCard({ m, run, busy, token, reload, setNotice }) {
               {current.live?.roundsPlayed != null && <span className="muted">Runde {current.live.roundsPlayed + 1}</span>}
             </div>
           )}
+          {m.server?.address && (
+            <div className="admin-address small">
+              Server <strong>{m.server.address.host}:{m.server.address.port}</strong>
+              {m.server.address.tvPort && <> · CSTV {m.server.address.host}:{m.server.address.tvPort}</>}
+            </div>
+          )}
           {paused && <span className="admin-badge is-paused">Pausiert</span>}
         </div>
         <button className="link-btn" onClick={() => setOpen(!open)}>{open ? 'Weniger' : 'Details'}</button>
diff --git a/server/src/matchService.js b/server/src/matchService.js
index 7c6b597..f4a61d4 100644
--- a/server/src/matchService.js
+++ b/server/src/matchService.js
@@ -956,6 +956,9 @@ export class MatchService extends EventEmitter {
       updatedAt: row.updated_at,
       idleTimeoutMinutes: this.config.idleTimeoutMinutes,
     };
+    if (viewer.isOrganizer && row.host) {
+      view.address = { host: row.host, port: row.port, tvPort: row.tv_port };
+    }
     const configured = row.status === 'configured';
     if (!configured || viewer.role === 'public') return view;