diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py
index e10516c4c..2e73d3770 100644
--- a/netbox/extras/choices.py
+++ b/netbox/extras/choices.py
@@ -56,11 +56,13 @@ class CustomFieldVisibilityChoices(ChoiceSet):
     VISIBILITY_READ_WRITE = 'read-write'
     VISIBILITY_READ_ONLY = 'read-only'
     VISIBILITY_HIDDEN = 'hidden'
+    VISIBILITY_HIDDEN_IFUNSET = 'hidden-ifunset'
 
     CHOICES = (
         (VISIBILITY_READ_WRITE, 'Read/Write'),
         (VISIBILITY_READ_ONLY, 'Read-only'),
         (VISIBILITY_HIDDEN, 'Hidden'),
+        (VISIBILITY_HIDDEN_IFUNSET, 'Hidden if unset'),
     )
 
 
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index b26a09205..55eb8b562 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -131,21 +131,25 @@
               </td>
             </tr>
             {% for field, value in fields.items %}
-              <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>
+              {% 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 %}
             {% endfor %}
           {% endfor %}
         </table>
diff --git a/netbox/templates/inc/panels/custom_fields.html b/netbox/templates/inc/panels/custom_fields.html
index 7f5f4cc27..51da6134d 100644
--- a/netbox/templates/inc/panels/custom_fields.html
+++ b/netbox/templates/inc/panels/custom_fields.html
@@ -11,21 +11,25 @@
           {% endif %}
           <table class="table table-hover attr-table">
             {% for field, value in fields.items %}
-              <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>
+              {% 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 %}
             {% endfor %}
           </table>
         {% endfor %}