1 files changed, 4 insertions, 1 deletions

diff --git a/subprojects/frontend/src/xtext/XtextWebSocketClient.ts b/subprojects/frontend/src/xtext/XtextWebSocketClient.ts
index 6bb7eec8..963c1d4c 100644
--- a/subprojects/frontend/src/xtext/XtextWebSocketClient.ts
+++ b/subprojects/frontend/src/xtext/XtextWebSocketClient.ts
@@ -282,7 +282,10 @@ export default class XtextWebSocketClient {
     log.debug('Creating WebSocket');
 
     (async () => {
-      const { webSocketURL } = await fetchBackendConfig();
+      let { webSocketURL } = await fetchBackendConfig();
+      if (webSocketURL === undefined) {
+        webSocketURL = `${window.origin.replace(/^http/, 'ws')}/xtext-service`;
+      }
       this.openWebSocketWithURL(webSocketURL);
     })().catch((error) => {
       log.error('Error while initializing connection', error);