diff --git a/src/lib/evas/cserve2/evas_cs2_client.c b/src/lib/evas/cserve2/evas_cs2_client.c
index 5ebd35c7e8..4433e5507f 100644
--- a/src/lib/evas/cserve2/evas_cs2_client.c
+++ b/src/lib/evas/cserve2/evas_cs2_client.c
@@ -385,6 +385,11 @@ _server_dispatch_until(unsigned int rid)
                        return EINA_FALSE;
                     }
                }
+             else if (!sel)
+               {
+                  WRN("select() timed out. giving up on request %d", rid);
+                  return EINA_FALSE;
+               }
           }
      }
    return EINA_TRUE;