diff --git a/src/lib/evas/cserve2/evas_cs2_client.c b/src/lib/evas/cserve2/evas_cs2_client.c
index d532644113..ee635dfad4 100644
--- a/src/lib/evas/cserve2/evas_cs2_client.c
+++ b/src/lib/evas/cserve2/evas_cs2_client.c
@@ -648,6 +648,7 @@ _server_dispatch_until(unsigned int rid)
                        ERR("Could not reconnect to cserve2!");
                        return EINA_FALSE;
                     }
+                  if (socketfd == -1) return EINA_FALSE;
                }
 
              //DBG("Waiting for request %d...", rid);