diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
index a33b6b949067c8306186f93ba64db23ca11d29e4..e7e2c46e25d3ad0d8cc8b9cab238a81c7210d32a 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
@@ -69,13 +69,13 @@ public enum Gmm {
       Gomez_2022.Crustal.class,
       Gomez_2022.Crustal.NAME,
       Gomez_2022.Crustal.COEFFS,
-      Gomez_2022.Crustal.CONSTRAINTS),
+      Gomez_2022.Crustal.CONSTRAINTS_CRUSTAL),
 
   GOMEZ_22_NONCRUSTAL(
       Gomez_2022.NonCrustal.class,
       Gomez_2022.NonCrustal.NAME,
       Gomez_2022.NonCrustal.COEFFS,
-      Gomez_2022.NonCrustal.CONSTRAINTS),
+      Gomez_2022.NonCrustal.CONSTRAINTS_CRUSTAL),
 
   /*
    * Active continent NGA-West1 WUS 2008.
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gomez_2022.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gomez_2022.java
index 87d23e2b49d22d5e19ec15e991d187316918f2e6..5c9b17be59caf494e3dc04a6515c24803611ac3a 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gomez_2022.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gomez_2022.java
@@ -31,7 +31,7 @@ import gov.usgs.earthquake.nshmp.tree.LogicTree;
  *
  * <p><b>doi:</b></a>
  *
- * <p><b>Component:</b> not specified (avg horizontal implied)
+ * <p><b>Component:</b> not specified (avg. horizontal implied)
  *
  * @author U.S. Geological Survey
  * @see Gmm#GOMEZ22_CRUSTAL
@@ -42,11 +42,16 @@ public abstract class Gomez_2022 implements GroundMotionModel {
   static final String NAME = "Gomez (2022) BETA";
 
   /* TODO: set constraints */
-  static final Constraints CONSTRAINTS = Constraints.builder()
+  static final Constraints CONSTRAINTS_CRUSTAL = Constraints.builder()
       .set(MW, Range.closed(4.0, 9.5))
       .set(RRUP, Range.closed(0.0, 1000.0))
       .set(VS30, Range.closed(150.0, 1000.0))
       .build();
+  static final Constraints CONSTRAINTS_NONCRUSTAL = Constraints.builder()
+      .set(MW, Range.closed(3.8, 9.5)) // M 3.8 - 5.0
+      .set(RRUP, Range.closed(0.0, 1000.0)) // 100 - 400 km
+      .set(VS30, Range.closed(150.0, 1000.0))
+      .build();
 
   static final CoefficientContainer COEFFS = new CoefficientContainer("Gomez2022.csv");