diff --git a/cime_config/usermods_dirs/NEON/defaults/shell_commands b/cime_config/usermods_dirs/NEON/defaults/shell_commands
index 437201f2b2..1f5427ca98 100644
--- a/cime_config/usermods_dirs/NEON/defaults/shell_commands
+++ b/cime_config/usermods_dirs/NEON/defaults/shell_commands
@@ -32,7 +32,7 @@ else
 fi
 
 # If needed for SP simulations: & set history file variables
-if [[ $compset =~ .*CLM[0-9]+%.*SP.* ]]; then
+if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
   if [[ $TEST != "TRUE" ]]; then
     ./xmlchange STOP_OPTION=nyears
   fi