diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index 933ae63be..d4c634f21 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -1384,7 +1384,7 @@ class Domain(TimeStampedModel, DomainHelper):
 
     @transition(
         field="state",
-        source=[State.DNS_NEEDED],
+        source=[State.DNS_NEEDED, State.READY],
         target=State.READY,
         # conditions=[dns_not_needed]
     )
@@ -1549,7 +1549,7 @@ class Domain(TimeStampedModel, DomainHelper):
             data = registry.send(req, cleaned=True).res_data[0]
             host = {
                 "name": name,
-                "addrs": getattr(data, "addrs", ...),
+                "addrs": [item.addr for item in getattr(data, "addrs", [])],
                 "cr_date": getattr(data, "cr_date", ...),
                 "statuses": getattr(data, "statuses", ...),
                 "tr_date": getattr(data, "tr_date", ...),
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 23306bda9..4d977891d 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -228,7 +228,7 @@ class DomainNameserversView(DomainFormBaseView, BaseFormSet):
 
         if nameservers is not None:
             # Add existing nameservers as initial data
-            initial_data.extend({"server": name, "ip": ip} for name, ip in nameservers)
+            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: