diff --git a/assay/package-lock.json b/assay/package-lock.json
index acb16b1c504..b2abb321ba6 100644
--- a/assay/package-lock.json
+++ b/assay/package-lock.json
@@ -8,7 +8,7 @@
       "name": "assay",
       "version": "0.0.0",
       "dependencies": {
-        "@labkey/components": "6.56.0"
+        "@labkey/components": "6.58.0"
       },
       "devDependencies": {
         "@labkey/build": "8.6.0",
@@ -2415,9 +2415,9 @@
       }
     },
     "node_modules/@labkey/api": {
-      "version": "1.42.0",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.42.0.tgz",
-      "integrity": "sha512-fh65cogl+8HNe9+3OHzI6ygkaa+ARJbKyUopguy3NqtOWIAXAA21GNxayRoeVf9m1n2Kpubqk4QS2z/+WCzf8A==",
+      "version": "1.42.1",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.42.1.tgz",
+      "integrity": "sha512-rT+Q/ZM6bE6bU8HDj/7f3DIFuq538e+LZAvBw8P3qJjuAnyO+O+ItZz/YukAKCXXiN2GdedOXDJbt1Ms0bgLsg==",
       "license": "Apache-2.0"
     },
     "node_modules/@labkey/build": {
@@ -2458,13 +2458,13 @@
       }
     },
     "node_modules/@labkey/components": {
-      "version": "6.56.0",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-6.56.0.tgz",
-      "integrity": "sha512-IFOLxW7zh1NB5aukqqyLSW19XYxKg37Sqf2QN2V4OqUI/oCAy2OcRGquHC/zw0CGo5qJmQXO74/uODLznvGsBQ==",
+      "version": "6.58.0",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-6.58.0.tgz",
+      "integrity": "sha512-+3isgrqshwRFINTyXZyTnxy3ZsK34KmZQhPX4IKWDchO6ztrelqTdD6vxC+Ksutn2aRzRQfcMasy7e8JmjVdcw==",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
-        "@labkey/api": "1.42.0",
+        "@labkey/api": "1.42.1",
         "@testing-library/dom": "~10.4.0",
         "@testing-library/jest-dom": "~6.6.3",
         "@testing-library/react": "~16.3.0",
diff --git a/assay/package.json b/assay/package.json
index ed419d715fe..d2222dc0478 100644
--- a/assay/package.json
+++ b/assay/package.json
@@ -12,7 +12,7 @@
     "clean": "rimraf resources/web/assay/gen && rimraf resources/views/gen && rimraf resources/web/gen"
   },
   "dependencies": {
-    "@labkey/components": "6.56.0"
+    "@labkey/components": "6.58.0"
   },
   "devDependencies": {
     "@labkey/build": "8.6.0",
diff --git a/assay/src/org/labkey/assay/AssayDomainServiceImpl.java b/assay/src/org/labkey/assay/AssayDomainServiceImpl.java
index c8c59335656..c32882cef23 100644
--- a/assay/src/org/labkey/assay/AssayDomainServiceImpl.java
+++ b/assay/src/org/labkey/assay/AssayDomainServiceImpl.java
@@ -641,12 +641,11 @@ public GWTProtocol saveChanges(GWTProtocol assay, boolean replaceIfExisting) thr
 
                 for (GWTDomain<GWTPropertyDescriptor> domain : assay.getDomains())
                 {
-                    GWTDomain<GWTPropertyDescriptor> previous = DomainUtil.getDomainDescriptor(getUser(), domain.getDomainURI(), protocol.getContainer());
-                    updateDomainDescriptor(provider, protocol, previous, domain, hasNameChange, changeDetails.toString(), assay.getAuditUserComment(), oldProps, newProps);
-                    boolean hasExistingCalcFields = previous != null && !previous.getCalculatedFields().isEmpty();
+                    GWTDomain<GWTPropertyDescriptor> domainDescriptor = DomainUtil.getDomainDescriptor(getUser(), domain.getDomainURI(), protocol.getContainer());
+                    boolean hasExistingCalcFields = domainDescriptor != null && !domainDescriptor.getCalculatedFields().isEmpty();
 
-                    GWTDomain<GWTPropertyDescriptor> savedDomain = DomainUtil.getDomainDescriptor(getUser(), domain.getDomainURI(), protocol.getContainer());
-                    QueryService.get().saveCalculatedFieldsMetadata(savedDomain.getSchemaName(), savedDomain.getQueryName(), null, domain.getCalculatedFields(), hasExistingCalcFields, getUser(), protocol.getContainer());
+                    updateDomainDescriptor(provider, protocol, domainDescriptor, domain, hasNameChange, changeDetails.toString(), assay.getAuditUserComment(), oldProps, newProps);
+                    QueryService.get().saveCalculatedFieldsMetadata(domainDescriptor.getSchemaName(), domainDescriptor.getQueryName(), null, domain.getCalculatedFields(), hasExistingCalcFields, getUser(), protocol.getContainer());
                 }
 
                 QueryService.get().updateLastModified();
diff --git a/core/package-lock.json b/core/package-lock.json
index 5fdc24b736a..d4a71b87620 100644
--- a/core/package-lock.json
+++ b/core/package-lock.json
@@ -8,7 +8,7 @@
       "name": "labkey-core",
       "version": "0.0.0",
       "dependencies": {
-        "@labkey/components": "6.56.0",
+        "@labkey/components": "6.58.0",
         "@labkey/themes": "1.4.2"
       },
       "devDependencies": {
@@ -3461,9 +3461,9 @@
       }
     },
     "node_modules/@labkey/api": {
-      "version": "1.42.0",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.42.0.tgz",
-      "integrity": "sha512-fh65cogl+8HNe9+3OHzI6ygkaa+ARJbKyUopguy3NqtOWIAXAA21GNxayRoeVf9m1n2Kpubqk4QS2z/+WCzf8A==",
+      "version": "1.42.1",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.42.1.tgz",
+      "integrity": "sha512-rT+Q/ZM6bE6bU8HDj/7f3DIFuq538e+LZAvBw8P3qJjuAnyO+O+ItZz/YukAKCXXiN2GdedOXDJbt1Ms0bgLsg==",
       "license": "Apache-2.0"
     },
     "node_modules/@labkey/build": {
@@ -3504,13 +3504,13 @@
       }
     },
     "node_modules/@labkey/components": {
-      "version": "6.56.0",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-6.56.0.tgz",
-      "integrity": "sha512-IFOLxW7zh1NB5aukqqyLSW19XYxKg37Sqf2QN2V4OqUI/oCAy2OcRGquHC/zw0CGo5qJmQXO74/uODLznvGsBQ==",
+      "version": "6.58.0",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-6.58.0.tgz",
+      "integrity": "sha512-+3isgrqshwRFINTyXZyTnxy3ZsK34KmZQhPX4IKWDchO6ztrelqTdD6vxC+Ksutn2aRzRQfcMasy7e8JmjVdcw==",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
-        "@labkey/api": "1.42.0",
+        "@labkey/api": "1.42.1",
         "@testing-library/dom": "~10.4.0",
         "@testing-library/jest-dom": "~6.6.3",
         "@testing-library/react": "~16.3.0",
diff --git a/core/package.json b/core/package.json
index 9f1a293458f..3f570de907c 100644
--- a/core/package.json
+++ b/core/package.json
@@ -53,7 +53,7 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "6.56.0",
+    "@labkey/components": "6.58.0",
     "@labkey/themes": "1.4.2"
   },
   "devDependencies": {
diff --git a/experiment/package-lock.json b/experiment/package-lock.json
index 967033b7c8e..16685ead27f 100644
--- a/experiment/package-lock.json
+++ b/experiment/package-lock.json
@@ -8,7 +8,7 @@
       "name": "experiment",
       "version": "0.0.0",
       "dependencies": {
-        "@labkey/components": "6.56.0"
+        "@labkey/components": "6.58.0"
       },
       "devDependencies": {
         "@labkey/build": "8.6.0",
@@ -3204,9 +3204,9 @@
       }
     },
     "node_modules/@labkey/api": {
-      "version": "1.42.0",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.42.0.tgz",
-      "integrity": "sha512-fh65cogl+8HNe9+3OHzI6ygkaa+ARJbKyUopguy3NqtOWIAXAA21GNxayRoeVf9m1n2Kpubqk4QS2z/+WCzf8A==",
+      "version": "1.42.1",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.42.1.tgz",
+      "integrity": "sha512-rT+Q/ZM6bE6bU8HDj/7f3DIFuq538e+LZAvBw8P3qJjuAnyO+O+ItZz/YukAKCXXiN2GdedOXDJbt1Ms0bgLsg==",
       "license": "Apache-2.0"
     },
     "node_modules/@labkey/build": {
@@ -3247,13 +3247,13 @@
       }
     },
     "node_modules/@labkey/components": {
-      "version": "6.56.0",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-6.56.0.tgz",
-      "integrity": "sha512-IFOLxW7zh1NB5aukqqyLSW19XYxKg37Sqf2QN2V4OqUI/oCAy2OcRGquHC/zw0CGo5qJmQXO74/uODLznvGsBQ==",
+      "version": "6.58.0",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-6.58.0.tgz",
+      "integrity": "sha512-+3isgrqshwRFINTyXZyTnxy3ZsK34KmZQhPX4IKWDchO6ztrelqTdD6vxC+Ksutn2aRzRQfcMasy7e8JmjVdcw==",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
-        "@labkey/api": "1.42.0",
+        "@labkey/api": "1.42.1",
         "@testing-library/dom": "~10.4.0",
         "@testing-library/jest-dom": "~6.6.3",
         "@testing-library/react": "~16.3.0",
diff --git a/experiment/package.json b/experiment/package.json
index e83ba70d14b..0818ea393b8 100644
--- a/experiment/package.json
+++ b/experiment/package.json
@@ -13,7 +13,7 @@
     "test-integration": "cross-env NODE_ENV=test jest --ci --runInBand -c test/js/jest.config.integration.js"
   },
   "dependencies": {
-    "@labkey/components": "6.56.0"
+    "@labkey/components": "6.58.0"
   },
   "devDependencies": {
     "@labkey/build": "8.6.0",
diff --git a/pipeline/package-lock.json b/pipeline/package-lock.json
index bb47c97bf3f..b3228844cee 100644
--- a/pipeline/package-lock.json
+++ b/pipeline/package-lock.json
@@ -8,7 +8,7 @@
       "name": "pipeline",
       "version": "0.0.0",
       "dependencies": {
-        "@labkey/components": "6.56.0"
+        "@labkey/components": "6.58.0"
       },
       "devDependencies": {
         "@labkey/build": "8.6.0",
@@ -2673,9 +2673,9 @@
       }
     },
     "node_modules/@labkey/api": {
-      "version": "1.42.0",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.42.0.tgz",
-      "integrity": "sha512-fh65cogl+8HNe9+3OHzI6ygkaa+ARJbKyUopguy3NqtOWIAXAA21GNxayRoeVf9m1n2Kpubqk4QS2z/+WCzf8A==",
+      "version": "1.42.1",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/api/-/@labkey/api-1.42.1.tgz",
+      "integrity": "sha512-rT+Q/ZM6bE6bU8HDj/7f3DIFuq538e+LZAvBw8P3qJjuAnyO+O+ItZz/YukAKCXXiN2GdedOXDJbt1Ms0bgLsg==",
       "license": "Apache-2.0"
     },
     "node_modules/@labkey/build": {
@@ -2716,13 +2716,13 @@
       }
     },
     "node_modules/@labkey/components": {
-      "version": "6.56.0",
-      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-6.56.0.tgz",
-      "integrity": "sha512-IFOLxW7zh1NB5aukqqyLSW19XYxKg37Sqf2QN2V4OqUI/oCAy2OcRGquHC/zw0CGo5qJmQXO74/uODLznvGsBQ==",
+      "version": "6.58.0",
+      "resolved": "https://labkey.jfrog.io/artifactory/api/npm/libs-client/@labkey/components/-/@labkey/components-6.58.0.tgz",
+      "integrity": "sha512-+3isgrqshwRFINTyXZyTnxy3ZsK34KmZQhPX4IKWDchO6ztrelqTdD6vxC+Ksutn2aRzRQfcMasy7e8JmjVdcw==",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
-        "@labkey/api": "1.42.0",
+        "@labkey/api": "1.42.1",
         "@testing-library/dom": "~10.4.0",
         "@testing-library/jest-dom": "~6.6.3",
         "@testing-library/react": "~16.3.0",
diff --git a/pipeline/package.json b/pipeline/package.json
index f365a882ad9..9fe5a3eb09e 100644
--- a/pipeline/package.json
+++ b/pipeline/package.json
@@ -14,7 +14,7 @@
     "build-prod": "npm run clean && cross-env NODE_ENV=production PROD_SOURCE_MAP=source-map webpack --config node_modules/@labkey/build/webpack/prod.config.js --color --progress --profile"
   },
   "dependencies": {
-    "@labkey/components": "6.56.0"
+    "@labkey/components": "6.58.0"
   },
   "devDependencies": {
     "@labkey/build": "8.6.0",