diff --git a/driver/GFDL/atmosphere.F90 b/driver/GFDL/atmosphere.F90
index 9a79bb95c..196967ba6 100644
--- a/driver/GFDL/atmosphere.F90
+++ b/driver/GFDL/atmosphere.F90
@@ -95,7 +95,7 @@ module atmosphere_mod
 #endif
 
 use mpp_domains_mod, only:  mpp_get_data_domain, mpp_get_compute_domain
-use gfdl_mp_mod,        only: gfdl_mp_init, gfdl_mp_end
+use gfdl_mp_mod,        only: qs_init, gfdl_mp_init, gfdl_mp_end
 use coarse_graining_mod, only: coarse_graining_init
 use coarse_grained_diagnostics_mod, only: fv_coarse_diag_init, fv_coarse_diag
 use coarse_grained_restart_files_mod, only: fv_coarse_restart_init
@@ -314,6 +314,8 @@ subroutine atmosphere_init (Time_init, Time, Time_step, Surf_diff, Grid_box)
 
    if (Atm(mygrid)%flagstruct%do_inline_mp) then
      call gfdl_mp_init(input_nml_file, stdlog(), Atm(mygrid)%flagstruct%hydrostatic)
+   else
+     call qs_init
    endif
 
    call timing_on('FV_RESTART')
diff --git a/model/gfdl_mp.F90 b/model/gfdl_mp.F90
index 4cd97bbf6..22c2db2dc 100644
--- a/model/gfdl_mp.F90
+++ b/model/gfdl_mp.F90
@@ -7233,8 +7233,6 @@ function es_core (length, tk, table, des)
 
     real :: ap1, tmin
 
-    if (.not. tables_are_initialized) call qs_init
-
     tmin = tice - 160.
     ap1 = 10. * dim (tk, tmin) + 1.
     ap1 = min (2621., ap1)