diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java
index 4b6018a41..36fe2bfe4 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java
@@ -253,10 +253,7 @@ public class Device {
 
   @Override
   public boolean equals(Object other) {
-    if (other == null || !(other instanceof Device)) return false;
-
-    Device that = (Device)other;
-    return this.id == that.id;
+    return (other instanceof Device that) && this.id == that.id;
   }
 
   @Override