Seeing all models (ipads/MBP) inside "model" criteria in smart groups before they're enrolled

New Contributor III

Hi all,
I might be missing something here, and I hope theres an easy solution but if you're splitting out the hardware via model names in smart groups, you cant add the device to the smartgroup before it enrolls thus defying the whole point of DEP and on enrollment.

Am I doing something wrong as this seems like a shortfall of smart groups + criteria matching?