diff --git a/client/src/contexts/SocketIO/useSocket.js b/client/src/contexts/SocketIO/useSocket.js
index 42385bfb7..9af0dcf99 100644
--- a/client/src/contexts/SocketIO/useSocket.js
+++ b/client/src/contexts/SocketIO/useSocket.js
@@ -75,7 +75,7 @@ const useSocket = (bodyshop) => {
         socketRef.current = null;
       }
     };
-  }, [bodyshop.id]);
+  }, [bodyshop?.id]);
 
   return { socket: socketRef.current, clientId };
 };
diff --git a/server/ioevent/ioevent.js b/server/ioevent/ioevent.js
index 36950b84e..252a77b42 100644
--- a/server/ioevent/ioevent.js
+++ b/server/ioevent/ioevent.js
@@ -27,6 +27,7 @@ exports.default = async (req, res) => {
         useremail
       }
     });
+
     ioRedis.to(getBodyshopRoom(bodyshopid)).emit("bodyshop-message", {
       operationName,
       useremail