diff --git a/src/core/chat_user.cpp b/src/core/chat_user.cpp
index 66fd5f9..06b16ff 100644
--- a/src/core/chat_user.cpp
+++ b/src/core/chat_user.cpp
@@ -366,9 +366,17 @@ namespace Yc
 					if (heartbeatCounter >= HEARTBEAT_INTERVAL) {
 						heartbeatCounter = 0;
 						
-						// Prüfe Verbindung mit MSG_PEEK (nicht-blockierend)
-						char peek;
-						ssize_t r = recv(_socket, &peek, 1, MSG_PEEK | MSG_DONTWAIT);
+											// Prüfe Verbindung mit MSG_PEEK (nicht-blockierend)
+					// Für WebSocket: Skip heartbeat check da libwebsockets das verwaltet
+					if (_wsi) {
+						#ifdef YC_DEBUG
+						std::cout << "[Debug] WebSocket user, skipping socket check" << std::endl;
+						#endif
+						continue;
+					}
+					
+					char peek;
+					ssize_t r = recv(_socket, &peek, 1, MSG_PEEK | MSG_DONTWAIT);
 						
 						if (r == 0) {
 							#ifdef YC_DEBUG