diff --git a/server/src/services/videoSocketService.js b/server/src/services/videoSocketService.js
index 653f158b..28de934a 100644
--- a/server/src/services/videoSocketService.js
+++ b/server/src/services/videoSocketService.js
@@ -14,7 +14,14 @@ function buildWhepUrl(roverId) {
   if (!base) {
     return '';
   }
-  const cleanBase = base.replace(/\/$/, '');
+  let origin;
+  try {
+    const parsed = new URL(base);
+    origin = parsed.origin;
+  } catch (err) {
+    origin = base.replace(/\/.*$/, '');
+  }
+  const cleanBase = origin.replace(/\/$/, '');
   const encodedId = encodeURIComponent(roverId);
   return `${cleanBase}/${encodedId}/whep`;
 }