diff --git a/core/src/org/labkey/core/admin/AdminController.java b/core/src/org/labkey/core/admin/AdminController.java
index f476c815e38..a0e75e8dc74 100644
--- a/core/src/org/labkey/core/admin/AdminController.java
+++ b/core/src/org/labkey/core/admin/AdminController.java
@@ -11222,10 +11222,12 @@ public void setExistingValue(String existingValue)
             _existingValue = existingValue;
         }
 
-        public String getExistingValues()
+        public List<String> getExistingValues()
         {
-            // The JSP JavaScript delimits with "\n". Not sure where these "\r"s are coming from, but we need to strip them.
-            return _existingValues.replace("\r", "");
+            return Arrays.stream(StringUtils.trimToEmpty(_existingValues).split("\n"))
+                .map(String::trim)
+                .filter(s -> !s.isEmpty())
+                .toList();
         }
 
         @SuppressWarnings("unused")
@@ -11252,7 +11254,7 @@ private AllowedHost getAllowedHost(String value, BindException errors)
 
         private List<AllowedHost> getExistingAllowedHosts(BindException errors)
         {
-            List<AllowedHost> existing = Arrays.stream(getExistingValues().split("\n"))
+            List<AllowedHost> existing = getExistingValues().stream()
                 .map(value-> getAllowedHost(value, errors))
                 .toList();