diff --git a/notifications_utils/logging.py b/notifications_utils/logging.py
index c1be8d400..3de43e5db 100644
--- a/notifications_utils/logging.py
+++ b/notifications_utils/logging.py
@@ -138,7 +138,9 @@ class PIIFilter(logging.Filter):
         )  # ['alice@google.com', 'bob@abc.com']
         for email in emails:
             # do something with each found email string
-            msg = msg.replace(email, f"XXXXX{email[-10:]}")
+            email_parts = email.split("@")
+            masked_email = f"{email_parts[0][0:3]}XXX@{email_parts[1][0:7]}XXX"
+            msg = msg.replace(email, masked_email)
         return msg
 
     def filter(self, record):
diff --git a/tests/notifications_utils/test_logging.py b/tests/notifications_utils/test_logging.py
index 493caabae..07b60bec0 100644
--- a/tests/notifications_utils/test_logging.py
+++ b/tests/notifications_utils/test_logging.py
@@ -62,5 +62,5 @@ def test_pii_filter():
         args=None,
     )
     pii_filter = logging.PIIFilter()
-    clean_msg = "phone1: 1XXXXX55555, phone2: 1XXXXX55554, email1: XXXXXe@fake.gov, email2: XXXXX2.fake.gov"
+    clean_msg = "phone1: 1XXXXX55555, phone2: 1XXXXX55554, email1: fakXXX@fake.goXXX, email2: fakXXX@fake2.fXXX"
     assert pii_filter.filter(record).msg == clean_msg