diff --git a/cime_config/config_component_cesm.xml b/cime_config/config_component_cesm.xml
index dbf3b11e3..9cd09641c 100644
--- a/cime_config/config_component_cesm.xml
+++ b/cime_config/config_component_cesm.xml
@@ -420,6 +420,7 @@
     <values match="last">
       <value compset="_DATM.*_DOCN%SOM"			>OPTION2</value>
       <value compset="_POP2"				>OPTION2</value>
+      <value compset="_NEMO"				>OPTION2</value>
       <value compset="_MOM6"				>OPTION1</value>
       <value compset="_POP2" grid="oi%gx1v6"		>OPTION1</value>
       <value compset="_POP2" grid="oi%gx1v7"		>OPTION1</value>
@@ -483,6 +484,7 @@
       <value compset="DATM.*_MOM\d">TRUE</value>
       <value compset="CAM.*_MOM\d">TRUE</value>
       <value compset="CAM.*_POP\d">TRUE</value>
+      <value compset="CAM.*_NEMO">FALSE</value>
       <value compset="CAM.*_DOCN%SOM">TRUE</value>
     </values>
     <group>run_budgets</group>
diff --git a/mediator/esmFldsExchange_cesm_mod.F90 b/mediator/esmFldsExchange_cesm_mod.F90
index c7cee8d98..767b8bab7 100644
--- a/mediator/esmFldsExchange_cesm_mod.F90
+++ b/mediator/esmFldsExchange_cesm_mod.F90
@@ -1363,6 +1363,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
           end if
        end if
        if (fldchk(is_local%wrap%FBexp(compatm), 'So_t', rc=rc)) then
+          call addmap_from(compocn, 'So_t', compatm, mapnstod_consf, 'ofrac', ocn2atm_map)
           call addmrg_to(compatm, 'So_t', mrg_from=compocn, mrg_fld='So_t', mrg_type='copy')
        end if
     end if
diff --git a/mediator/med_map_mod.F90 b/mediator/med_map_mod.F90
index bcf178fbd..c17895c39 100644
--- a/mediator/med_map_mod.F90
+++ b/mediator/med_map_mod.F90
@@ -404,9 +404,13 @@ subroutine med_map_routehandles_initfrom_field(n1, n2, fldsrc, flddst, mapindex,
     ! override defaults for specific cases
     if (trim(coupling_mode) == 'cesm') then
        if (n1 == compwav .and. n2 == compocn) then
-         srcMaskValue = 0
-         dstMaskValue = ispval_mask
-      endif
+          srcMaskValue = 0
+          dstMaskValue = ispval_mask
+       endif
+       if (n1 == compocn .and. n2 == compatm) then
+          srcMaskValue = 0
+          dstMaskValue = 0
+       endif
     end if
     if (trim(coupling_mode(1:3)) == 'ufs') then
        if (n1 == compatm .and. n2 == complnd) then