An apparatus and method are presented comprising a stone retrieval device insertable through a proximal end of a working channel of an endoscope to retrieve a stone at a distal end of an endoscope shaft, and a lithotripsy shaft with a distal tip including one or more guide features to accommodate passage there through of the stone retrieval device and insertable through the proximal end of the working channel of the endoscope, wherein the stone retrieval device extends from the distal end of the endoscope shaft through the lithotripsy shaft.