diff --git a/platform/src/watchdog_kni.cpp b/platform/src/watchdog_kni.cpp
index 3275b3e..c28b580 100644
--- a/platform/src/watchdog_kni.cpp
+++ b/platform/src/watchdog_kni.cpp
@@ -33,6 +33,8 @@ static int watchdog_kni_fd_create()
     unsigned int tcp_keepintvl = 1;
     unsigned int tcp_keepidle = 1;
 
+    evutil_make_socket_nonblocking(fd);
+
     if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (const void *) &so_keepalive, sizeof(int)) == -1)
     {
         TFE_LOG_ERROR(g_default_logger, "watchdog fd setup setsockopt(SO_KEEPALIVE, %d) failed : %s",