diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md
index 8ed901918..eac4bd90d 100644
--- a/docs/release-notes/version-2.11.md
+++ b/docs/release-notes/version-2.11.md
@@ -5,6 +5,7 @@
 ### Bug Fixes
 
 * [#6710](https://github.com/netbox-community/netbox/issues/6710) - Fix assignment of VM interface parent via REST API
+* [#6714](https://github.com/netbox-community/netbox/issues/6714) - Fix rendering of device type component creation forms
 
 ---
 
diff --git a/netbox/templates/dcim/device_component_add.html b/netbox/templates/dcim/device_component_add.html
index 0937cc371..16cf267d0 100644
--- a/netbox/templates/dcim/device_component_add.html
+++ b/netbox/templates/dcim/device_component_add.html
@@ -26,7 +26,7 @@
                         {{ field }}
                     {% endfor %}
                     {% for field in form.visible_fields %}
-                        {% if field.name not in form.custom_fields %}
+                        {% if not form.custom_fields or field.name not in form.custom_fields %}
                             {% render_field field %}
                         {% endif %}
                     {% endfor %}