diff --git a/src/wayland-server.c b/src/wayland-server.c
index 9358eb46..421c3f02 100644
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -348,9 +348,11 @@ wl_resource_destroy(struct wl_resource *resource, uint32_t time)
 	struct wl_client *client = resource->client;
 
 	if (resource->object.id < WL_SERVER_ID_START) {
-		wl_resource_queue_event(resource->client->display_resource,
-					WL_DISPLAY_DELETE_ID,
-					resource->object.id);
+		if (client->display_resource) {
+			wl_resource_queue_event(client->display_resource,
+						WL_DISPLAY_DELETE_ID,
+						resource->object.id);
+		}
 		wl_map_insert_at(&client->objects, resource->object.id, NULL);
 	} else {
 		wl_map_remove(&client->objects, resource->object.id);