diff --git a/src/xterm.c b/src/xterm.c
index 771db4a05c9..4a47fdfd450 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -16908,7 +16908,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
         const XSelectionClearEvent *eventp = &event->xselectionclear;
 
 	if (eventp->selection == dpyinfo->motif_drag_atom
-	    && dpyinfo->motif_drag_atom_time <= eventp->time)
+	    && (eventp->time == CurrentTime
+		|| dpyinfo->motif_drag_atom_time <= eventp->time))
 	  dpyinfo->motif_drag_atom = None;
 
         inev.sie.kind = SELECTION_CLEAR_EVENT;