diff --git a/src/main/java/org/mskcc/oncokb/curation/web/filter/SpaWebFilter.java b/src/main/java/org/mskcc/oncokb/curation/web/filter/SpaWebFilter.java
index fcda84f84..3d09da66c 100644
--- a/src/main/java/org/mskcc/oncokb/curation/web/filter/SpaWebFilter.java
+++ b/src/main/java/org/mskcc/oncokb/curation/web/filter/SpaWebFilter.java
@@ -23,6 +23,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
             !path.startsWith("/v3/api-docs") &&
             !path.startsWith("/login") &&
             !path.startsWith("/oauth2") &&
+            !path.startsWith("/websocket") &&
             !path.contains(".") &&
             path.matches("/(.*)")
         ) {
diff --git a/src/main/java/org/mskcc/oncokb/curation/web/websocket/ProxyWebSocketHandler.java b/src/main/java/org/mskcc/oncokb/curation/web/websocket/ProxyWebSocketHandler.java
index f6e2420ed..67aa7aee8 100644
--- a/src/main/java/org/mskcc/oncokb/curation/web/websocket/ProxyWebSocketHandler.java
+++ b/src/main/java/org/mskcc/oncokb/curation/web/websocket/ProxyWebSocketHandler.java
@@ -25,7 +25,7 @@ public ProxyWebSocketHandler(ApplicationProperties applicationProperties) {
     @Override
     public void afterConnectionEstablished(WebSocketSession session) throws Exception {
         try {
-            String incomingUri = session.getUri().toString();
+            String incomingUri = session.getUri().getPath();
             StandardWebSocketClient client = new StandardWebSocketClient();
             OncoCoreWebSocketHandler handler = new OncoCoreWebSocketHandler(session);
             client.doHandshake(handler, this.baseUrl + "/api" + incomingUri);