diff --git a/src/wayland-server.c b/src/wayland-server.c
index a6cd88d5..33bedf7d 100644
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -314,8 +314,8 @@ wl_resource_destroy(struct wl_resource *resource, uint32_t time)
 {
 	struct wl_client *client = resource->client;
 
-	destroy_resource(resource, &time);
 	wl_map_insert_at(&client->objects, resource->object.id, NULL);
+	destroy_resource(resource, &time);
 }
 
 WL_EXPORT void