diff --git a/freqtrade/rpc/api_server/ws/proxy.py b/freqtrade/rpc/api_server/ws/proxy.py
index 24eb20585..c32494176 100644
--- a/freqtrade/rpc/api_server/ws/proxy.py
+++ b/freqtrade/rpc/api_server/ws/proxy.py
@@ -1,7 +1,7 @@
 from typing import Any
 
 from fastapi import WebSocket as FastAPIWebSocket
-from websockets.legacy.client import WebSocketClientProtocol as WebSocket
+from websockets.asyncio.client import ClientConnection as WebSocket
 
 from freqtrade.rpc.api_server.ws.types import WebSocketType
 
diff --git a/freqtrade/rpc/api_server/ws/types.py b/freqtrade/rpc/api_server/ws/types.py
index 0660bbd69..7ce2eb4bf 100644
--- a/freqtrade/rpc/api_server/ws/types.py
+++ b/freqtrade/rpc/api_server/ws/types.py
@@ -1,7 +1,7 @@
 from typing import Any, TypeVar
 
 from fastapi import WebSocket as FastAPIWebSocket
-from websockets.legacy.client import WebSocketClientProtocol as WebSocket
+from websockets.asyncio.client import ClientConnection as WebSocket
 
 
 WebSocketType = TypeVar("WebSocketType", FastAPIWebSocket, WebSocket)
diff --git a/freqtrade/rpc/external_message_consumer.py b/freqtrade/rpc/external_message_consumer.py
index ed6945458..fe22613bd 100644
--- a/freqtrade/rpc/external_message_consumer.py
+++ b/freqtrade/rpc/external_message_consumer.py
@@ -193,7 +193,7 @@ class ExternalMessageConsumer:
                 ws_url = f"{scheme}://{host}:{port}/api/v1/message/ws?token={token}"
 
                 # This will raise InvalidURI if the url is bad
-                async with websockets.legacy.client.connect(
+                async with websockets.connect(
                     ws_url, max_size=self.message_size_limit, ping_interval=None
                 ) as ws:
                     async with create_channel(ws, channel_id=name, send_throttle=0.5) as channel:
diff --git a/scripts/ws_client.py b/scripts/ws_client.py
index 81e539e26..46dd2da10 100755
--- a/scripts/ws_client.py
+++ b/scripts/ws_client.py
@@ -253,8 +253,7 @@ async def create_client(
         except (
             socket.gaierror,
             ConnectionRefusedError,
-            websockets.exceptions.InvalidStatusCode,
-            websockets.exceptions.InvalidMessage,
+            websockets.exceptions.InvalidHandshake,
         ) as e:
             logger.error(f"Connection Refused - {e} retrying in {sleep_time}s")
             await asyncio.sleep(sleep_time)