Djinni (except on the Plane of Air) should have a chance of dropping a scroll or wand of wishing when killed. But when you kill a djinni, all future djinni will spawn hostile.