diff --git a/legacy/evas/src/bin/evas_cserve2_requests.c b/legacy/evas/src/bin/evas_cserve2_requests.c
index 61bb544eee..df7ea19efd 100644
--- a/legacy/evas/src/bin/evas_cserve2_requests.c
+++ b/legacy/evas/src/bin/evas_cserve2_requests.c
@@ -158,7 +158,8 @@ cserve2_request_add(Font_Request_Type type, unsigned int rid, Client *client, Fo
         req->dependency = dep;
      }
 
-   _request_waiter_add(req, client, rid);
+   if (client && rid)
+     _request_waiter_add(req, client, rid);
 
    _cserve2_requests_process();