diff --git a/frontend/src/components/MessagesList/index.js b/frontend/src/components/MessagesList/index.js
index 0e3dbd3..8463931 100644
--- a/frontend/src/components/MessagesList/index.js
+++ b/frontend/src/components/MessagesList/index.js
@@ -240,6 +240,11 @@ const MessagesList = () => {
 	const [anchorEl, setAnchorEl] = useState(null);
 	const moreMenuOpen = Boolean(anchorEl);
 
+	useEffect(() => {
+		setPageNumber(1);
+		setMessagesList([]);
+	}, [ticketId]);
+
 	useEffect(() => {
 		setLoading(true);
 		const delayDebounceFn = setTimeout(() => {
@@ -293,8 +298,6 @@ const MessagesList = () => {
 
 		return () => {
 			socket.disconnect();
-			setPageNumber(1);
-			setMessagesList([]);
 		};
 	}, [ticketId, loading]);