diff --git a/library/net_sockets.c b/library/net_sockets.c
index 2d1c1082a..e63e496b9 100644
--- a/library/net_sockets.c
+++ b/library/net_sockets.c
@@ -470,8 +470,11 @@ int mbedtls_net_poll( mbedtls_net_context *ctx, uint32_t rw, uint32_t timeout )
     tv.tv_sec  = timeout / 1000;
     tv.tv_usec = ( timeout % 1000 ) * 1000;
 
-    ret = select( fd + 1, &read_fds, &write_fds, NULL,
-                  timeout == (uint32_t) -1 ? NULL : &tv );
+    do
+    {
+        ret = select( fd + 1, &read_fds, &write_fds, NULL,
+                      timeout == (uint32_t) -1 ? NULL : &tv );
+    } while( ret == EINTR );
 
     if( ret < 0 )
         return( MBEDTLS_ERR_NET_POLL_FAILED );