diff --git a/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java b/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java
index 837d5fc..73f0fe5 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/LensCodeRewriter.java
@@ -707,9 +707,8 @@
       DexType oldType,
       DexType newType,
       Value initialValue) {
-    if (initialValue.isConstNumber()
-        && initialValue.definition.asConstNumber().isZero()
-        && defaultValueHasChanged(oldType, newType)) {
+    if (initialValue.getType().isNullType() && defaultValueHasChanged(oldType, newType)) {
+      assert newType.isIntType();
       iterator.previous();
       Value rewrittenDefaultValue =
           iterator.insertConstNumberInstruction(