Officine Panerai Matt Black New Watch Strap fits a 24mm strap space and it has a space for a 21mm buckle. this is new and is a spare found in some boxes.
eBay