diff --git a/server/routers/olm/handleOlmRegisterMessage.ts b/server/routers/olm/handleOlmRegisterMessage.ts
index 7cbf5a2b..1ada2eba 100644
--- a/server/routers/olm/handleOlmRegisterMessage.ts
+++ b/server/routers/olm/handleOlmRegisterMessage.ts
@@ -142,7 +142,8 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
             siteId: site.siteId,
             endpoint: site.endpoint,
             publicKey: site.publicKey,
-            serverIP: site.address
+            serverIP: site.address,
+            serverPort: site.listenPort,
         });
     }
 
diff --git a/server/routers/olm/handleOlmRelayMessage.ts b/server/routers/olm/handleOlmRelayMessage.ts
index bef707e3..5a00f73f 100644
--- a/server/routers/olm/handleOlmRelayMessage.ts
+++ b/server/routers/olm/handleOlmRelayMessage.ts
@@ -40,22 +40,12 @@ export const handleOlmRelayMessage: MessageHandler = async (context) => {
         return;
     }
 
-    const sitesData = await db
-        .select()
-        .from(sites)
-        .innerJoin(clientSites, eq(sites.siteId, clientSites.siteId))
-        .where(eq(clientSites.clientId, client.clientId));
+    const { siteId } = message.data;
 
-    let jobs: Array<Promise<void>> = [];
-    for (const site of sitesData) {
-        // update the peer on the exit node
-        const job = updatePeer(site.sites.siteId, client.pubKey, {
-            endpoint: "" // this removes the endpoint
-        });
-        jobs.push(job);
-    }
-
-    await Promise.all(jobs);
+    // update the peer on the exit node
+    await updatePeer(siteId, client.pubKey, {
+        endpoint: "" // this removes the endpoint
+    });
 
     return;
 };