diff --git a/dev/parm/config/gfs/config.base.j2 b/dev/parm/config/gfs/config.base.j2
index 8b798acb1ea..21acc0ce02d 100644
--- a/dev/parm/config/gfs/config.base.j2
+++ b/dev/parm/config/gfs/config.base.j2
@@ -179,7 +179,11 @@ aero_fcst_runs="gdas" # When to run aerosol forecast: gdas, gfs, or both
 aero_anl_runs="gdas gfs" # When to run aerosol analysis: gdas, gfs, or both
 export DO_AERO_FCST="NO"
 export DO_AERO_ANL="NO"
-export DOBNDPNT_WAVE="YES" # Option to create point outputs for downstream boundary points 
+if [[ "${RUN}" == "gfs" ]] ; then
+   export DOBNDPNT_WAVE="YES" # Create point outputs for downstream boundary points
+else
+   export DOBNDPNT_WAVE="NO" 
+fi
 export FRAC_GRID=".true."
 export DO_NEST="NO" # Whether to run a global-nested domain
 if [[ "${DO_NEST:-NO}" == "YES" ]] ; then