Orbi & MAC Address Filtering - Is there a limit to number of devices?

Just enquiring to identify if there is a limit to the number of MAC Adress that the Orbi can handle when restricting access to the wifi.  My current device is capped at 16 devices per band, thus 32 overall.  With everything now coming as network enabled my household has almost reached its limit.  Want to ensure if I go with the Orbi, that there is future capacity available.