diff --git a/experiment/src/org/labkey/experiment/ExperimentUpgradeCode.java b/experiment/src/org/labkey/experiment/ExperimentUpgradeCode.java
index cdfe2e821a8..4c0c0485f90 100644
--- a/experiment/src/org/labkey/experiment/ExperimentUpgradeCode.java
+++ b/experiment/src/org/labkey/experiment/ExperimentUpgradeCode.java
@@ -193,7 +193,8 @@ private static void ensureBigObjectIds(Selector lastValueSelector, Consumer<Long
         }
     }
 
-    // called from exp-25.007-25.008.sql
+    // called from exp-25.009-25.010.sql
+    // When this is removed, the ExperimentWarningProvider class can also be removed.
     @SuppressWarnings("unused")
     public static void upgradeAmountsAndUnits(ModuleContext context)
     {
diff --git a/experiment/src/org/labkey/experiment/ExperimentWarningProvider.java b/experiment/src/org/labkey/experiment/ExperimentWarningProvider.java
index ae0cd1dc4bf..764b46c28c9 100644
--- a/experiment/src/org/labkey/experiment/ExperimentWarningProvider.java
+++ b/experiment/src/org/labkey/experiment/ExperimentWarningProvider.java
@@ -12,6 +12,7 @@
 import org.labkey.api.data.SQLFragment;
 import org.labkey.api.data.SqlSelector;
 import org.labkey.api.data.TableInfo;
+import org.labkey.api.module.ModuleLoader;
 import org.labkey.api.query.UserSchema;
 import org.labkey.api.security.User;
 import org.labkey.api.util.HtmlString;
@@ -19,6 +20,7 @@
 import org.labkey.api.view.template.WarningProvider;
 import org.labkey.api.view.template.Warnings;
 
+// Remove this class when the exp-25.009-25.010.sql script is no longer in use.
 public class ExperimentWarningProvider implements WarningProvider
 {
     private Long _actualRecordCount;
@@ -26,9 +28,13 @@ public class ExperimentWarningProvider implements WarningProvider
     @Override
     public void addDynamicWarnings(@NotNull Warnings warnings, @Nullable ViewContext context, boolean showAllWarnings)
     {
+        if (!ModuleLoader.getInstance().isStartupComplete())
+            return;
+
         PropertyManager.WritablePropertyMap props = PropertyManager.getWritableProperties(ExperimentModule.AMOUNT_AND_UNIT_UPGRADE_PROP, false);
         if (props == null || props.isEmpty())
             return;
+
         String expectedCount = props.get(ExperimentModule.AUDIT_COUNT_PROP);
         String transactionIdStr = props.get(ExperimentModule.TRANSACTION_ID_PROP);
         if (StringUtils.isEmpty(expectedCount) || StringUtils.isEmpty(transactionIdStr))