diff --git a/src/core_atmosphere/Registry.xml b/src/core_atmosphere/Registry.xml
index 425e0349d1..8c2b7a427b 100644
--- a/src/core_atmosphere/Registry.xml
+++ b/src/core_atmosphere/Registry.xml
@@ -485,9 +485,11 @@
                 <package name="les"
                          description="Variables and options associated with LES models"
                          active_when="trim(config_les_model) /= 'none'"/>
+#ifdef DO_PHYSICS
                 <package name="sfclayer"
                          description="Variables and options associated with surface layer physics"
-                         active_when="(trim(config_physics_suite) /= 'none' .and. trim(config_sfclayer_scheme) == 'suite') .or.  any(trim(config_sfclayer_scheme) == [ character(len=StrKind) :: 'sf_monin_obukhov', 'sf_monin_obukhov_rev', 'sf_mynn' ])"/>
+                         active_when="trim(config_sfclayer_scheme) /= 'off'"/>
+#endif
         </packages>
 
 
diff --git a/src/core_atmosphere/mpas_atm_core_interface.F b/src/core_atmosphere/mpas_atm_core_interface.F
index 21c651905e..ddae97d997 100644
--- a/src/core_atmosphere/mpas_atm_core_interface.F
+++ b/src/core_atmosphere/mpas_atm_core_interface.F
@@ -134,11 +134,6 @@ function atm_setup_packages(configs, streamInfo, packages, iocontext) result(ier
       integer :: local_ierr
 
 
-      ierr = atm_setup_packages_when(configs, packages)
-      if (ierr /= 0) then
-         return
-      end if
-
       !
       ! Incremental analysis update
       !
@@ -259,6 +254,11 @@ function atm_setup_packages(configs, streamInfo, packages, iocontext) result(ier
 
 #endif
 
+      ierr = atm_setup_packages_when(configs, packages)
+      if (ierr /= 0) then
+         return
+      end if
+
    end function atm_setup_packages