The original shelf peg was too short and would slip out of the hole, causing the shelf to fall.  Increased the pin length as well as the shelf support.

Made to replace pegs with 5 mm pin and a shelf thickness of 20 mm.