diff --git a/packages/hoppscotch-app/assets/scss/styles.scss b/packages/hoppscotch-app/assets/scss/styles.scss
index 6bf32b093..cfd656e5f 100644
--- a/packages/hoppscotch-app/assets/scss/styles.scss
+++ b/packages/hoppscotch-app/assets/scss/styles.scss
@@ -54,6 +54,7 @@ textarea {
 
 html {
   scroll-behavior: smooth;
+  scrollbar-gutter: stable;
 }
 
 body {
diff --git a/packages/hoppscotch-app/helpers/utils/__tests__/valid.spec.js b/packages/hoppscotch-app/helpers/utils/__tests__/valid.spec.js
index 413cb915d..e6946d045 100644
--- a/packages/hoppscotch-app/helpers/utils/__tests__/valid.spec.js
+++ b/packages/hoppscotch-app/helpers/utils/__tests__/valid.spec.js
@@ -7,8 +7,8 @@ describe("wsValid", () => {
   })
 
   test("returns true for valid URL with Hostname", () => {
-    expect(wsValid("wss://hoppscotch-websocket.herokuapp.com/")).toBe(true)
-    expect(wsValid("wss://hoppscotch-websocket.herokuapp.com")).toBe(true)
+    expect(wsValid("wss://echo-websocket.hoppscotch.io/")).toBe(true)
+    expect(wsValid("wss://echo-websocket.hoppscotch.io")).toBe(true)
   })
 
   test("returns false for invalid URL with IP address", () => {
@@ -29,8 +29,8 @@ describe("wsValid", () => {
   })
 
   test("returns true for wss protocol URLs", () => {
-    expect(wsValid("wss://hoppscotch-websocket.herokuapp.com/")).toBe(true)
-    expect(wsValid("wss://hoppscotch-websocket.herokuapp.com")).toBe(true)
+    expect(wsValid("wss://echo-websocket.hoppscotch.io/")).toBe(true)
+    expect(wsValid("wss://echo-websocket.hoppscotch.io")).toBe(true)
     expect(wsValid("wss://174.129.224.73/")).toBe(true)
     expect(wsValid("wss://174.129.224.73")).toBe(true)
   })
@@ -65,8 +65,8 @@ describe("httpValid", () => {
   })
 
   test("returns false for non-http(s) protocol URLs", () => {
-    expect(httpValid("wss://hoppscotch-websocket.herokuapp.com/")).toBe(false)
-    expect(httpValid("wss://hoppscotch-websocket.herokuapp.com")).toBe(false)
+    expect(httpValid("wss://echo-websocket.hoppscotch.io/")).toBe(false)
+    expect(httpValid("wss://echo-websocket.hoppscotch.io")).toBe(false)
     expect(httpValid("wss://174.129.224.73/")).toBe(false)
     expect(httpValid("wss://174.129.224.73")).toBe(false)
   })
@@ -129,10 +129,8 @@ describe("socketioValid", () => {
   })
 
   test("returns true for wss protocol URLs", () => {
-    expect(socketioValid("wss://hoppscotch-websocket.herokuapp.com/")).toBe(
-      true
-    )
-    expect(socketioValid("wss://hoppscotch-websocket.herokuapp.com")).toBe(true)
+    expect(socketioValid("wss://echo-websocket.hoppscotch.io/")).toBe(true)
+    expect(socketioValid("wss://echo-websocket.hoppscotch.io")).toBe(true)
     expect(socketioValid("wss://174.129.224.73/")).toBe(true)
     expect(socketioValid("wss://174.129.224.73")).toBe(true)
   })
diff --git a/packages/hoppscotch-app/newstore/SocketIOSession.ts b/packages/hoppscotch-app/newstore/SocketIOSession.ts
index 6d7240487..4b3aa57a4 100644
--- a/packages/hoppscotch-app/newstore/SocketIOSession.ts
+++ b/packages/hoppscotch-app/newstore/SocketIOSession.ts
@@ -25,7 +25,7 @@ type HoppSIOSession = {
 }
 
 const defaultSIORequest: HoppSIORequest = {
-  endpoint: "wss://hoppscotch-socketio.herokuapp.com",
+  endpoint: "wss://echo-socketio.hoppscotch.io",
   path: "/socket.io",
   version: "v4",
 }
diff --git a/packages/hoppscotch-app/newstore/WebSocketSession.ts b/packages/hoppscotch-app/newstore/WebSocketSession.ts
index 87e1c3232..9d2d76873 100644
--- a/packages/hoppscotch-app/newstore/WebSocketSession.ts
+++ b/packages/hoppscotch-app/newstore/WebSocketSession.ts
@@ -24,7 +24,7 @@ export type HoppWSSession = {
 }
 
 const defaultWSRequest: HoppWSRequest = {
-  endpoint: "wss://hoppscotch-websocket.herokuapp.com",
+  endpoint: "wss://echo-websocket.hoppscotch.io",
   protocols: [],
 }