diff --git a/src/client/constants/endpoints.ts b/src/client/constants/endpoints.ts
index ba1d0d6..b24b7f2 100644
--- a/src/client/constants/endpoints.ts
+++ b/src/client/constants/endpoints.ts
@@ -1,4 +1,3 @@
 export const COMICBOOKINFO_SERVICE_URI = "http://localhost:3080/api/comicvine/";
 export const API_BASE_URI = "http://localhost:8050/api/";
-export const SOCKET_BASE_URI =
-  process.env.DOCKERHOST + ":8051" || "ws://localhost:8051";
+export const SOCKET_BASE_URI = "ws://localhost:8051";
diff --git a/src/client/context/socket/socket.context.tsx b/src/client/context/socket/socket.context.tsx
index e948030..6a0a2db 100644
--- a/src/client/context/socket/socket.context.tsx
+++ b/src/client/context/socket/socket.context.tsx
@@ -8,7 +8,8 @@ import { success } from "react-notification-system-redux";
 const WebSocketContext = createContext(null);
 export const WebSocketProvider = ({ children }): ReactElement => {
   const dispatch = useDispatch();
-  const socket: Socket = io(SOCKET_BASE_URI);
+  const socketHost = process.env.DOCKERHOST + ":8051" || SOCKET_BASE_URI;
+  const socket: Socket = io(socketHost);
 
   socket.on("connect", () => {
     dispatch({