diff --git a/ESP8266.cpp b/ESP8266.cpp
index 47bcc7c..cab229d 100644
--- a/ESP8266.cpp
+++ b/ESP8266.cpp
@@ -286,6 +286,7 @@ uint32_t ESP8266::recv(uint8_t mux_id, uint8_t *buffer, uint32_t buffer_size, ui
 
 uint32_t ESP8266::recv(uint8_t *coming_mux_id, uint8_t *buffer, uint32_t buffer_size, uint32_t timeout)
 {
+	if(!m_puart->available()) return 0; // don't enter while loop if there is no serial data available
     return recvPkg(buffer, buffer_size, NULL, timeout, coming_mux_id);
 }