diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c
index 0832c69505..61b15b33ad 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -818,7 +818,12 @@ ecore_wl2_display_disconnect(Ecore_Wl2_Display *display)
    --display->refs;
    if (display->refs == 0)
      {
-        wl_display_roundtrip(display->wl.display);
+        int ret;
+
+        do
+          {
+             ret = wl_display_dispatch_pending(display->wl.display);
+          } while (ret > 0);
 
         _ecore_wl2_display_cleanup(display);