diff --git a/Source/DataStructs/DataStruct.H b/Source/DataStructs/DataStruct.H
index bc21a6244..72981ae87 100644
--- a/Source/DataStructs/DataStruct.H
+++ b/Source/DataStructs/DataStruct.H
@@ -91,13 +91,7 @@ struct SolverChoice {
             moisture_type = MoistureType::None;
         }
 
-        // Which expression (1,2 or 3) to use for buoyancy
-        pp.query("buoyancy_type", buoyancy_type);
-        if (buoyancy_type != 1 && buoyancy_type != 2 && buoyancy_type != 3 && buoyancy_type != 4) {
-            amrex::Abort("buoyancy_type must be 1, 2, 3 or 4");
-        }
-
-
+        // TODO: should we set default for dry??
         // Set a different default for moist vs dry
         if (moisture_type != MoistureType::None) {
             if (moisture_type == MoistureType::FastEddy) {
@@ -107,6 +101,12 @@ struct SolverChoice {
             }
         }
 
+        // Which expression (1,2 or 3) to use for buoyancy
+        pp.query("buoyancy_type", buoyancy_type);
+        if (buoyancy_type != 1 && buoyancy_type != 2 && buoyancy_type != 3 && buoyancy_type != 4) {
+            amrex::Abort("buoyancy_type must be 1, 2, 3 or 4");
+        }
+
         // What type of land surface model to use
         static std::string lsm_model_string = "None";
         pp.query("land_surface_model", lsm_model_string);