diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckWidths.java b/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckWidths.java
index f4692940c71..01371c40a9e 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckWidths.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckWidths.java
@@ -35,10 +35,10 @@ public class CheckWidths extends CheckCLDR {
     private static UnitWidthUtil UNIT_WIDTHS_UTIL = UnitWidthUtil.getInstance();
 
     /** Controls for the warning about too many components, and for when to cause error. */
-    public static final int WARN_COMPONENTS_PER_ANNOTATION = 10;
+    public static final int WARN_COMPONENTS_PER_ANNOTATION = 12;
 
     // TBD lower this down after Meta data added
-    public static final int MAX_COMPONENTS_PER_ANNOTATION = 45;
+    public static final int MAX_COMPONENTS_PER_ANNOTATION = 20;
 
     SupplementalDataInfo supplementalData;