diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java
index 4f81567bb..2b7127a02 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ProfileController.java
@@ -388,6 +388,7 @@ public class ProfileController {
   private void checkFingerprintAndAdd(BatchIdentityCheckRequest.Element element,
       Collection<BatchIdentityCheckResponse.Element> responseElements, MessageDigest md) {
     accountsManager.getByAccountIdentifier(element.aci()).ifPresent(account -> {
+      if (account.getIdentityKey() == null) return;
       byte[] identityKeyBytes;
       try {
         identityKeyBytes = Base64.getDecoder().decode(account.getIdentityKey());