diff --git a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/Initializer.java b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/Initializer.java
index 0aeca69ed00..8312c60c97e 100644
--- a/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/Initializer.java
+++ b/dd-java-agent/agent-crashtracking/src/main/java/datadog/crashtracking/Initializer.java
@@ -17,6 +17,7 @@
 import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.StringTokenizer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,7 +47,7 @@ public String getValue(String flagName) {
     @Override
     public boolean setValue(String flagName, String value) {
       flags.setStringFlag(flagName, value);
-      return flags.getStringFlag(flagName).equals(value);
+      return Objects.equals(flags.getStringFlag(flagName), value);
     }
   }