diff --git a/components/eamxx/src/share/io/scorpio_output.hpp b/components/eamxx/src/share/io/scorpio_output.hpp
index 7bb9695f5871..db8ba10e76f4 100644
--- a/components/eamxx/src/share/io/scorpio_output.hpp
+++ b/components/eamxx/src/share/io/scorpio_output.hpp
@@ -221,7 +221,7 @@ class AtmosphereOutput
   // How to combine multiple snapshots in the output: instant, Max, Min, Average
   OutputAvgType m_avg_type;
   Real m_avg_coeff_threshold =
-      0.5; // % of unfilled values required to not just assign value as FillValue
+      0.01; // % of unfilled values required to not just assign value as FillValue
 
   // Internal maps to the output fields, how the columns are distributed, the file dimensions and
   // the global ids.
diff --git a/components/eamxx/src/share/remap/horizontal_remapper.cpp b/components/eamxx/src/share/remap/horizontal_remapper.cpp
index 2cb8484c7f26..a5920a2e03a9 100644
--- a/components/eamxx/src/share/remap/horizontal_remapper.cpp
+++ b/components/eamxx/src/share/remap/horizontal_remapper.cpp
@@ -501,7 +501,7 @@ rescale_masked_fields (const Field& x, const Field& real_mask) const
   const auto& layout = x.get_header().get_identifier().get_layout();
   const int rank = layout.rank();
   const int ncols = m_tgt_grid->get_num_local_dofs();
-  const Real mask_threshold = std::numeric_limits<Real>::epsilon();  // TODO: Should we not hardcode the threshold for simply masking out the column.
+  const Real mask_threshold = 0.25;
 
   Pack fv_pack(fill_val);
   auto& mask = x.get_valid_mask();