diff --git a/proxy.conf.json b/proxy.conf.json
index 7013d453ba05421043f76537ba15d3dd65cf3f90..cc2d66deb1cf1ef603ad77379c773850c9956bcd 100644
--- a/proxy.conf.json
+++ b/proxy.conf.json
@@ -31,7 +31,7 @@
     },
 		"logLevel": "debug"
   },
-  "/api/ws": {
+  "/api/ws/websocket": {
     "target": "ws://localhost:8099",
     "secure": false,
     "pathRewrite": {
diff --git a/src/app/rx-stomp.config.ts b/src/app/rx-stomp.config.ts
index 74ba1265b1d34d36a2c41082da20fed289e66171..c1ab0b4525b53e738e9f560f4d389a527bbc335e 100644
--- a/src/app/rx-stomp.config.ts
+++ b/src/app/rx-stomp.config.ts
@@ -4,7 +4,7 @@ import { environment } from './../environments/environment';
 export const ARSRxStompConfig: RxStompConfig = {
   // Which server?
   brokerURL: (window.location.protocol === 'http:' ) ?
-    `ws://${window.location.hostname}:8080/ws/websocket` : `wss://${window.location.hostname}/api/ws/websocket`,
+    `ws://${window.location.hostname}:/api/ws/websocket` : `wss://${window.location.hostname}/api/ws/websocket`,
 
   connectHeaders: {
     login: 'guest',