diff --git a/src/socket.cpp b/src/socket.cpp
index 6d48178f9..7b70d4295 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -331,6 +331,9 @@ bool UDPSocket::WaitData(int timeout_ms)
 				<<timeout_ms<<")"<<std::endl;*/
 		return false;
 	}
+	else if(result < 0 && errno == EINTR){
+		return false;
+	}
 	else if(result < 0){
 		// Error
 #ifndef DISABLE_ERRNO