diff --git a/src/main/java/org/moera/node/option/OptionValueChange.java b/src/main/java/org/moera/node/option/OptionValueChange.java
index 099be00d..181de16b 100644
--- a/src/main/java/org/moera/node/option/OptionValueChange.java
+++ b/src/main/java/org/moera/node/option/OptionValueChange.java
@@ -1,5 +1,6 @@
 package org.moera.node.option;
 
+import java.util.Objects;
 import java.util.UUID;
 
 public class OptionValueChange {
@@ -49,7 +50,7 @@ public void setNewValue(Object newValue) {
     }
 
     public boolean isTangible() {
-        return !previousValue.equals(newValue);
+        return !Objects.equals(previousValue, newValue);
     }
 
 }