diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/UserAgentTagUtil.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/UserAgentTagUtil.java
index a2b66c8f7..7ff0b9fb4 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/UserAgentTagUtil.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/UserAgentTagUtil.java
@@ -26,7 +26,7 @@ public class UserAgentTagUtil {
             "desktop", Pattern.compile("^Signal Desktop (1[^ ]+).*$", Pattern.CASE_INSENSITIVE),
             "ios", Pattern.compile("^Signal/(3[^ ]+) \\(.*ios.*\\)$", Pattern.CASE_INSENSITIVE));
 
-    static final         int                       MAX_VERSIONS  = 10_000;
+    static final         int                       MAX_VERSIONS  = 1_000;
     private static final Set<Pair<String, String>> SEEN_VERSIONS = new HashSet<>();
 
     private UserAgentTagUtil() {
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/UserAgentTagUtilTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/UserAgentTagUtilTest.java
index 172d42f7e..391aeb432 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/UserAgentTagUtilTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/UserAgentTagUtilTest.java
@@ -26,13 +26,13 @@ public class UserAgentTagUtilTest {
     private Object argumentsForTestGetUserAgentTags() {
         return new Object[] {
                 new Object[] { "This is obviously not a reasonable User-Agent string.", UserAgentTagUtil.UNRECOGNIZED_TAGS },
-                new Object[] { null, UserAgentTagUtil.UNRECOGNIZED_TAGS },
-                new Object[] { "Signal-Android 4.53.7 (Android 8.1)", List.of(Tag.of(UserAgentTagUtil.PLATFORM_TAG, "android"), Tag.of(UserAgentTagUtil.VERSION_TAG, "4.53.7")) },
-                new Object[] { "Signal Desktop 1.2.3", List.of(Tag.of(UserAgentTagUtil.PLATFORM_TAG, "desktop"), Tag.of(UserAgentTagUtil.VERSION_TAG, "1.2.3")) },
-                new Object[] { "Signal/3.9.0 (iPhone; iOS 12.2; Scale/3.00)", List.of(Tag.of(UserAgentTagUtil.PLATFORM_TAG, "ios"), Tag.of(UserAgentTagUtil.VERSION_TAG, "3.9.0")) },
-                new Object[] { "Signal-Android 1.2.3 (Android 8.1)", UserAgentTagUtil.UNRECOGNIZED_TAGS },
-                new Object[] { "Signal Desktop 3.9.0", UserAgentTagUtil.UNRECOGNIZED_TAGS },
-                new Object[] { "Signal/4.53.7 (iPhone; iOS 12.2; Scale/3.00)", UserAgentTagUtil.UNRECOGNIZED_TAGS },
+                new Object[] { null,                                                    UserAgentTagUtil.UNRECOGNIZED_TAGS },
+                new Object[] { "Signal-Android 4.53.7 (Android 8.1)",                   List.of(Tag.of(UserAgentTagUtil.PLATFORM_TAG, "android"), Tag.of(UserAgentTagUtil.VERSION_TAG, "4.53.7")) },
+                new Object[] { "Signal Desktop 1.2.3",                                  List.of(Tag.of(UserAgentTagUtil.PLATFORM_TAG, "desktop"), Tag.of(UserAgentTagUtil.VERSION_TAG, "1.2.3")) },
+                new Object[] { "Signal/3.9.0 (iPhone; iOS 12.2; Scale/3.00)",           List.of(Tag.of(UserAgentTagUtil.PLATFORM_TAG, "ios"), Tag.of(UserAgentTagUtil.VERSION_TAG, "3.9.0")) },
+                new Object[] { "Signal-Android 1.2.3 (Android 8.1)",                    UserAgentTagUtil.UNRECOGNIZED_TAGS },
+                new Object[] { "Signal Desktop 3.9.0",                                  UserAgentTagUtil.UNRECOGNIZED_TAGS },
+                new Object[] { "Signal/4.53.7 (iPhone; iOS 12.2; Scale/3.00)",          UserAgentTagUtil.UNRECOGNIZED_TAGS },
         };
     }