diff --git a/netbox/netbox/models/features.py b/netbox/netbox/models/features.py
index 6d82e2a2b..2c409a216 100644
--- a/netbox/netbox/models/features.py
+++ b/netbox/netbox/models/features.py
@@ -227,6 +227,8 @@ class CustomFieldsMixin(models.Model):
 
         for cf in visible_custom_fields:
             value = self.custom_field_data.get(cf.name)
+            if not value and cf.ui_visibility == CustomFieldVisibilityChoices.VISIBILITY_HIDDEN_IFUNSET:
+                continue
             value = cf.deserialize(value)
             groups[cf.group_name][cf] = value
 
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index 55eb8b562..7bc0d9856 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -131,25 +131,21 @@
               </td>
             </tr>
             {% for field, value in fields.items %}
-              {% if field.ui_visibility == 'hidden-ifunset' and not value %}
-                  <!-- Skip hidden fields -->
-              {% else %}
-                <tr>
-                  <th scope="row">{{ field }}
-                    {% if field.description %}
-                      <i
-                        class="mdi mdi-information text-primary"
-                        data-bs-toggle="tooltip"
-                        data-bs-placement="right"
-                        title="{{ field.description|escape }}"
-                      ></i>
-                    {% endif %}
-                  </th>
-                  <td>
-                    {% customfield_value field value %}
-                  </td>
-                </tr>
-              {% endif %}
+              <tr>
+                <th scope="row">{{ field }}
+                  {% if field.description %}
+                    <i
+                      class="mdi mdi-information text-primary"
+                      data-bs-toggle="tooltip"
+                      data-bs-placement="right"
+                      title="{{ field.description|escape }}"
+                    ></i>
+                  {% endif %}
+                </th>
+                <td>
+                  {% customfield_value field value %}
+                </td>
+              </tr>
             {% endfor %}
           {% endfor %}
         </table>
diff --git a/netbox/templates/inc/panels/custom_fields.html b/netbox/templates/inc/panels/custom_fields.html
index 51da6134d..7f5f4cc27 100644
--- a/netbox/templates/inc/panels/custom_fields.html
+++ b/netbox/templates/inc/panels/custom_fields.html
@@ -11,25 +11,21 @@
           {% endif %}
           <table class="table table-hover attr-table">
             {% for field, value in fields.items %}
-              {% if field.ui_visibility == 'hidden-ifunset' and not value %}
-                  <!-- Skip hidden fields -->
-              {% else %}
-                <tr>
-                  <th scope="row">{{ field }}
-                    {% if field.description %}
-                      <i
-                        class="mdi mdi-information text-primary"
-                        data-bs-toggle="tooltip"
-                        data-bs-placement="right"
-                        title="{{ field.description|escape }}"
-                      ></i>
-                    {% endif %}
-                  </th>
-                  <td>
-                    {% customfield_value field value %}
-                  </td>
-                </tr>
-              {% endif %}
+              <tr>
+                <th scope="row">{{ field }}
+                  {% if field.description %}
+                    <i
+                      class="mdi mdi-information text-primary"
+                      data-bs-toggle="tooltip"
+                      data-bs-placement="right"
+                      title="{{ field.description|escape }}"
+                    ></i>
+                  {% endif %}
+                </th>
+                <td>
+                  {% customfield_value field value %}
+                </td>
+              </tr>
             {% endfor %}
           </table>
         {% endfor %}