diff --git a/src/WebSocketsClient.cpp b/src/WebSocketsClient.cpp
index 987ff85..2f703ef 100644
--- a/src/WebSocketsClient.cpp
+++ b/src/WebSocketsClient.cpp
@@ -340,7 +340,7 @@ void WebSocketsClient::handleClientData(void) {
         switch(_client.status) {
             case WSC_HEADER:
             {
-                String headerLine = _client->tcp->readStringUntil('\n');
+                String headerLine = _client.tcp->readStringUntil('\n');
                 handleHeader(&_client, &headerLine);
             }
                 break;
diff --git a/src/WebSocketsServer.cpp b/src/WebSocketsServer.cpp
index cddb606..ebde1bf 100644
--- a/src/WebSocketsServer.cpp
+++ b/src/WebSocketsServer.cpp
@@ -98,15 +98,15 @@ void WebSocketsServer::begin(void) {
     DEBUG_WEBSOCKETS("[WS-Server] Server Started.\n");
 }
 
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
 /**
  * called in arduino loop
  */
 void WebSocketsServer::loop(void) {
-#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
     handleNewClients();
     handleClientData();
-#endif
 }
+#endif
 
 /**
  * set callback function
diff --git a/src/WebSocketsServer.h b/src/WebSocketsServer.h
index f1840cc..34036dd 100644
--- a/src/WebSocketsServer.h
+++ b/src/WebSocketsServer.h
@@ -42,7 +42,14 @@ public:
         ~WebSocketsServer(void);
 
         void begin(void);
+#if (WEBSOCKETS_NETWORK_TYPE != NETWORK_ESP8266_ASYNC)
         void loop(void);
+#else
+        // Async interface not need a loop call
+        void loop(void) __attribute__ ((deprecated)) {
+
+        }
+#endif
 
         void onEvent(WebSocketServerEvent cbEvent);