diff --git a/parm/config/config.wave b/parm/config/config.wave
index 19ee337401..f59881c982 100755
--- a/parm/config/config.wave
+++ b/parm/config/config.wave
@@ -69,11 +69,11 @@ export OUTPARS_WAV="WND HS FP DP PHS PTP PDIR"
 # Restart file config
 if [ "$CDUMP" = "gdas" ]; then
   WAVNCYC=4
-  WAVHCYC=6
+  WAVHCYC=${assim_freq:-6}
   FHMAX_WAV_CUR=${FHMAX_WAV_CUR:-48} # RTOFS forecasts only out to 8 days
 elif [ ${gfs_cyc} -ne 0 ]; then
   FHMAX_WAV_CUR=${FHMAX_WAV_CUR:-192} # RTOFS forecasts only out to 8 days
-  WAVHCYC=`expr 24 / ${gfs_cyc}`
+  WAVHCYC=${assim_freq:-6}
 else
   WAVHCYC=0
   FHMAX_WAV_CUR=${FHMAX_WAV_CUR:-192} # RTOFS forecasts only out to 8 days