diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index 2552bb76f..b64618ea5 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -496,6 +496,17 @@ REST_FRAMEWORK = {
 }
 
 
+#
+# Graphene
+#
+
+GRAPHENE = {
+    # Avoids naming collision on models with 'type' field; see
+    # https://github.com/graphql-python/graphene-django/issues/185
+    'DJANGO_CHOICE_FIELD_ENUM_V3_NAMING': True,
+}
+
+
 #
 # drf_yasg (OpenAPI/Swagger)
 #