diff --git a/core-util-jvm/src/main/java/org/signal/core/util/logging/Scrubber.kt b/core-util-jvm/src/main/java/org/signal/core/util/logging/Scrubber.kt
index 6d6281d917..2d6886ae7f 100644
--- a/core-util-jvm/src/main/java/org/signal/core/util/logging/Scrubber.kt
+++ b/core-util-jvm/src/main/java/org/signal/core/util/logging/Scrubber.kt
@@ -30,12 +30,10 @@ object Scrubber {
   private const val EMAIL_CENSOR = "...@..."
 
   /** The middle group will be censored. */
-  private val GROUP_ID_V1_PATTERN = Pattern.compile("(__)(textsecure_group__![^\\s]+)([^\\s]{2})")
-  private const val GROUP_ID_V1_CENSOR = "...group..."
+  private val GROUP_ID_V1_PATTERN = Pattern.compile("(__textsecure_group__!)([^\\s]+)([^\\s]{3})")
 
   /** The middle group will be censored. */
-  private val GROUP_ID_V2_PATTERN = Pattern.compile("(__)(signal_group__v2__![^\\s]+)([^\\s]{2})")
-  private const val GROUP_ID_V2_CENSOR = "...group_v2..."
+  private val GROUP_ID_V2_PATTERN = Pattern.compile("(__signal_group__v2__!)([^\\s]+)([^\\s]{3})")
 
   /** The middle group will be censored. */
   private val UUID_PATTERN = Pattern.compile("(JOB::)?([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{9})([0-9a-f]{3})", Pattern.CASE_INSENSITIVE)
@@ -128,8 +126,7 @@ object Scrubber {
   private fun CharSequence.scrubGroupsV1(): CharSequence {
     return scrub(this, GROUP_ID_V1_PATTERN) { matcher, output ->
       output
-        .append(matcher.group(1))
-        .append(GROUP_ID_V1_CENSOR)
+        .append("GV1::***")
         .append(matcher.group(3))
     }
   }
@@ -137,8 +134,7 @@ object Scrubber {
   private fun CharSequence.scrubGroupsV2(): CharSequence {
     return scrub(this, GROUP_ID_V2_PATTERN) { matcher, output ->
       output
-        .append(matcher.group(1))
-        .append(GROUP_ID_V2_CENSOR)
+        .append("GV2::***")
         .append(matcher.group(3))
     }
   }
diff --git a/core-util-jvm/src/test/java/org/signal/core/util/logging/ScrubberTest.kt b/core-util-jvm/src/test/java/org/signal/core/util/logging/ScrubberTest.kt
index f16323fbec..3f1b581f89 100644
--- a/core-util-jvm/src/test/java/org/signal/core/util/logging/ScrubberTest.kt
+++ b/core-util-jvm/src/test/java/org/signal/core/util/logging/ScrubberTest.kt
@@ -104,19 +104,19 @@ class ScrubberTest(private val input: String, private val expected: String) {
         ),
         arrayOf(
           "__textsecure_group__!000102030405060708090a0b0c0d0e0f",
-          "__...group...0f"
+          "GV1::***e0f"
         ),
         arrayOf(
           "A group id __textsecure_group__!000102030405060708090a0b0c0d0e1a surrounded with text",
-          "A group id __...group...1a surrounded with text"
+          "A group id GV1::***e1a surrounded with text"
         ),
         arrayOf(
           "__signal_group__v2__!0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
-          "__...group_v2...ef"
+          "GV2::***def"
         ),
         arrayOf(
           "A group v2 id __signal_group__v2__!23456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01 surrounded with text",
-          "A group v2 id __...group_v2...01 surrounded with text"
+          "A group v2 id GV2::***f01 surrounded with text"
         ),
         arrayOf(
           "a37cb654-c9e0-4c1e-93df-3d11ca3c97f4",
@@ -140,7 +140,7 @@ class ScrubberTest(private val input: String, private val expected: String) {
         ),
         arrayOf(
           "All patterns in a row __textsecure_group__!abcdefg1234567890 +123456789012345 abc@def.com a37cb654-c9e0-4c1e-93df-3d11ca3c97f4 nl.motorsport.com 192.168.1.1 with text after",
-          "All patterns in a row __...group...90 E164:<78d5b> a...@... ********-****-****-****-*********7f4 ***.com ...ipv4... with text after"
+          "All patterns in a row GV1::***890 E164:<78d5b> a...@... ********-****-****-****-*********7f4 ***.com ...ipv4... with text after"
         ),
         arrayOf(
           "java.net.UnknownServiceException: CLEARTEXT communication to nl.motorsport.com not permitted by network security policy",