diff --git a/js/NodePortal.js b/js/NodePortal.js
index e3b4a1c..54b63e9 100644
--- a/js/NodePortal.js
+++ b/js/NodePortal.js
@@ -267,6 +267,9 @@ function getControlWsUrl(host) {
         path += "SCIDE/";
     }
     path += "SCExecutor";
+    if (isBaaS) {
+        path = path.replace("ide/", "")
+    }
     return prefix + host + path;
 }
 
diff --git a/js/OnlineIDE.js b/js/OnlineIDE.js
index d3a40c7..8edd28a 100644
--- a/js/OnlineIDE.js
+++ b/js/OnlineIDE.js
@@ -129,9 +129,13 @@ function getControlWsUrl(host) {
     }
     let path = document.location.pathname.lastIndexOf("/");
     path = document.location.pathname.substr(0, path + 1);
-    if (path.indexOf("SCIDE") < 0)
+    if (path.indexOf("SCIDE") < 0) {
         path += "SCIDE/";
+    }
     path += "SCExecutor";
+    if (isBaaS) {
+        path = path.replace("ide/", "")
+    }
     return prefix + host + path;
 }