diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java
index 2f07926ae..ee9a4bff6 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java
@@ -445,7 +445,7 @@ public class Accounts extends AbstractDynamoDbStore {
     final byte[] accountJsonBytes;
 
     try {
-      accountJsonBytes = SystemMapper.jsonMapper().writeValueAsBytes(account);
+      accountJsonBytes = ACCOUNT_DDB_JSON_WRITER.writeValueAsBytes(account);
     } catch (final JsonProcessingException e) {
       throw new IllegalArgumentException(e);
     }