diff --git a/dev/prod/src/platform.ts b/dev/prod/src/platform.ts
index e88cd1471d..5fe1593bea 100644
--- a/dev/prod/src/platform.ts
+++ b/dev/prod/src/platform.ts
@@ -493,7 +493,7 @@ export async function configurePlatform() {
 
   setMetadata(billingPlugin.metadata.BillingURL, config.BILLING_URL ?? '')
 
-  setMetadata(presentation.metadata.PulseUrl, config.PULSE_URL ?? '')
+  setMetadata(presentation.metadata.PulseUrl, config.PULSE_URL)
 
   const languages = myBranding.languages
     ? (myBranding.languages as string).split(',').map((l) => l.trim())
diff --git a/plugins/presence-resources/src/pulse.ts b/plugins/presence-resources/src/pulse.ts
index 8fac7fe4d7..07ab39afba 100644
--- a/plugins/presence-resources/src/pulse.ts
+++ b/plugins/presence-resources/src/pulse.ts
@@ -25,13 +25,10 @@ function getWorkspace (): string {
   return getMetadata(presentation.metadata.WorkspaceUuid) ?? ''
 }
 
-export function getPulseClient (): HulypulseClient | undefined {
-  return pulseclient
-}
-
-export async function createPulseClient (): Promise<HulypulseClient> {
+export async function createPulseClient (): Promise<HulypulseClient | undefined> {
   if (pulseclient == null) {
     const wsPulseUrl = getMetadata(presentation.metadata.PulseUrl)
+    if (wsPulseUrl == null || wsPulseUrl.trim().length === 0) return undefined
     const token = getMetadata(presentation.metadata.Token)
     pulseclient = await HulypulseClient.connect(`${wsPulseUrl}?token=${token}`)
   }