diff --git a/src/app/components/SpeciesColorPicker.js b/src/app/components/SpeciesColorPicker.js
index 4d10a54..cfe8fee 100644
--- a/src/app/components/SpeciesColorPicker.js
+++ b/src/app/components/SpeciesColorPicker.js
@@ -179,8 +179,11 @@ function SpeciesColorPicker({
         aria-label="Pet color"
         value={colorId}
         // We also wait for the valid pairs before enabling, so users can't
-        // trigger change events we're not ready for.
-        isLoading={allColors.length === 0 || loadingValids}
+        // trigger change events we're not ready for. Also, if the caller
+        // hasn't provided species and color yet, assume it's still loading.
+        isLoading={
+          allColors.length === 0 || loadingValids || !speciesId || !colorId
+        }
         isDisabled={isDisabled}
         onChange={onChangeColor}
         size={size}