diff --git a/src/wakaama-client.cpp b/src/wakaama-client.cpp
index 29c663c..9ee6711 100644
--- a/src/wakaama-client.cpp
+++ b/src/wakaama-client.cpp
@@ -106,8 +106,11 @@ void ArduinoClient::doWorkStep() {
     // wait for socket event
     SerialUSB.println(F("parsePacket()"));
     size_t pending = data.nbIOT->socketBytesPending(data.sock);
-    if (pending > 0) {
+    if (pending >= 0) {
         size_t numBytes = data.nbIOT->socketReceive(data.sock, packetBuffer, pending);
+        if (pending == 0) {
+            return;
+        }
 
         connection_t * connP;
         connP = connection_find(data.connList, data.sock);