diff --git a/src/lib/ecore_x/xlib/ecore_x_dnd.c b/src/lib/ecore_x/xlib/ecore_x_dnd.c
index 601c8ce4f8..d673094807 100644
--- a/src/lib/ecore_x/xlib/ecore_x_dnd.c
+++ b/src/lib/ecore_x/xlib/ecore_x_dnd.c
@@ -541,6 +541,8 @@ ecore_x_dnd_send_status(Eina_Bool will_accept,
 {
    XEvent xev;
 
+   EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
+
    if (_target->state == ECORE_X_DND_TARGET_IDLE)
      return;
 
@@ -591,6 +593,8 @@ ecore_x_dnd_send_finished(void)
 {
    XEvent xev;
 
+   EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp);
+
    if (_target->state == ECORE_X_DND_TARGET_IDLE)
      return;