diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/KeysDynamoDb.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/KeysDynamoDb.java
index 969a0e797..3fcc9dbb1 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/KeysDynamoDb.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/KeysDynamoDb.java
@@ -99,7 +99,7 @@ public class KeysDynamoDb extends AbstractDynamoDbStore {
               .returnValues(ReturnValue.ALL_OLD)
               .build();
           DeleteItemResponse deleteItemResponse = db().deleteItem(deleteItemRequest);
-          if (deleteItemResponse.attributes() != null) {
+          if (deleteItemResponse.hasAttributes()) {
             return Optional.of(getPreKeyFromItem(deleteItemResponse.attributes()));
           }