diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceInfo.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceInfo.java
index da66df7d6..5e96168d2 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceInfo.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/DeviceInfo.java
@@ -7,12 +7,12 @@ package org.whispersystems.textsecuregcm.entities;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import org.whispersystems.textsecuregcm.util.ByteArrayAdapter;
+import org.whispersystems.textsecuregcm.util.ByteArrayBase64WithPaddingAdapter;
 
 public record DeviceInfo(long id,
 
-                         @JsonSerialize(using = ByteArrayAdapter.Serializing.class)
-                         @JsonDeserialize(using = ByteArrayAdapter.Deserializing.class)
+                         @JsonSerialize(using = ByteArrayBase64WithPaddingAdapter.Serializing.class)
+                         @JsonDeserialize(using = ByteArrayBase64WithPaddingAdapter.Deserializing.class)
                          byte[] name,
 
                          long lastSeen,