diff --git a/src/registrar/templates/domain_nameservers.html b/src/registrar/templates/domain_nameservers.html
index ef2ff879a..b6e5bc250 100644
--- a/src/registrar/templates/domain_nameservers.html
+++ b/src/registrar/templates/domain_nameservers.html
@@ -50,7 +50,18 @@
   <form class="usa-form usa-form--extra-large nameservers-form" method="post" novalidate id="form-container">
     {% csrf_token %}
     {{ formset.management_form }}
-
+    {% for form in formset %}
+    <fieldset class="usa-fieldset">
+      <label class="usa-label" for="given-name">Name server {{forloop.counter}} </label>
+      <div class="usa-hint" id="gnHint">Example: ns{{forloop.counter}}.example.com</div>
+      <input
+        class="usa-input usa-input--xl"
+        id="given-name"
+        name="first-name"
+        aria-describedby="gnHint"
+      />
+  </form>
+    {% endfor %}
     <!--
     if no data in formset: 
       build 2 blank forms
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 297cb689a..9599b24e3 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -757,8 +757,9 @@ class DomainNameserversView(DomainFormBaseView):
             initial_data.extend({"server": name, "ip": ",".join(ip)} for name, ip in nameservers)
 
         # Ensure at least 3 fields, filled or empty
-        while len(initial_data) < 2:
-            initial_data.append({})
+        if len(initial_data) == 0:
+            while len(initial_data) < 2:
+                initial_data.append({})
 
         return initial_data