diff --git a/libweston/data-device.c b/libweston/data-device.c
index bc2661c0..3506454c 100644
--- a/libweston/data-device.c
+++ b/libweston/data-device.c
@@ -420,8 +420,7 @@ drag_surface_configure(struct weston_drag *drag,
 	assert((pointer != NULL && touch == NULL) ||
 			(pointer == NULL && touch != NULL));
 
-	/* XXX: Why are we checking for a valid buffer here too ... ? */
-	if (!weston_surface_is_mapped(es) && es->buffer_ref.buffer) {
+	if (!weston_surface_is_mapped(es) && weston_surface_has_content(es)) {
 		if (pointer && pointer->sprite &&
 			weston_view_is_mapped(pointer->sprite))
 			list = &pointer->sprite->layer_link;