diff --git a/netbox/templates/dcim/interface_edit.html b/netbox/templates/dcim/interface_edit.html
index e45cdd685..4c7545ee6 100644
--- a/netbox/templates/dcim/interface_edit.html
+++ b/netbox/templates/dcim/interface_edit.html
@@ -2,13 +2,18 @@
 {% load form_helpers %}
 
 {% block form %}
+    {# Render hidden fields #}
+    {% for field in form.hidden_fields %}
+      {{ field }}
+    {% endfor %}
+
     <div class="field-group my-5">
         <div class="row mb-2">
           <h5 class="offset-sm-3">Interface</h5>
         </div>
         {% if form.instance.device %}
             <div class="row mb-3">
-                <label class="col-sm-3 col-form-label text-lg-end required" for="id_device">Device</label>
+                <label class="col-sm-3 col-form-label text-lg-end">Device</label>
                 <div class="col">
                     <input class="form-control" value="{{ form.instance.device }}" disabled />
                 </div>
diff --git a/netbox/templates/virtualization/vminterface_edit.html b/netbox/templates/virtualization/vminterface_edit.html
index 687c6c090..de8825574 100644
--- a/netbox/templates/virtualization/vminterface_edit.html
+++ b/netbox/templates/virtualization/vminterface_edit.html
@@ -2,17 +2,22 @@
 {% load form_helpers %}
 
 {% block form %}
+    {# Render hidden fields #}
+    {% for field in form.hidden_fields %}
+      {{ field }}
+    {% endfor %}
+
     <div class="field-group my-5">
       <div class="row mb-2">
         <h5 class="offset-sm-3">Interface</h5>
       </div>
       {% if form.instance.virtual_machine %}
-          <div class="row mb-3">
-              <label class="col-sm-3 col-form-label text-lg-end required" for="id_device">Virtual Machine</label>
-              <div class="col">
-                  <input class="form-control" value="{{ form.instance.virtual_machine }}" disabled />
-              </div>
+        <div class="row mb-3">
+          <label class="col-sm-3 col-form-label text-lg-end required" for="id_device">Virtual Machine</label>
+          <div class="col">
+            <input class="form-control" value="{{ form.instance.virtual_machine }}" disabled />
           </div>
+        </div>
       {% endif %}
       {% render_field form.name %}
       {% render_field form.description %}