diff --git a/netbox/utilities/choices.py b/netbox/utilities/choices.py
index 6e6afe3e2..19082dbb6 100644
--- a/netbox/utilities/choices.py
+++ b/netbox/utilities/choices.py
@@ -18,7 +18,7 @@ class ChoiceSet(metaclass=ChoiceSetMeta):
 
     @classmethod
     def values(cls):
-        return [c[0] for c in cls.CHOICES]
+        return [c[0] for c in unpack_grouped_choices(cls.CHOICES)]
 
     @classmethod
     def as_dict(cls):