From 54dfa6cb7fce89b75d64e2638a000e313ef9e533 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Wed, 7 Jul 2021 15:38:59 -0400
Subject: [PATCH] Fixes #6714: Fix rendering of device type component creation
 forms

---
 docs/release-notes/version-2.11.md              | 1 +
 netbox/templates/dcim/device_component_add.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md
index 8ed90191841..eac4bd90db0 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 0937cc371c1..16cf267d018 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 %}