diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
index 11b39dfa1de03..d016d257ee085 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/IpFieldMapper.java
@@ -582,11 +582,11 @@ protected void parseCreateField(DocumentParserContext context) throws IOExceptio
                 throw e;
             }
         }
-        if (address != null) {
+        if (nullValue != null) {
             indexValue(context, address);
         }
         if (offsetsFieldName != null && context.isImmediateParentAnArray() && context.canAddIgnoredField()) {
-            if (address != null) {
+            if (nullValue != null) {
                 BytesRef sortableValue = new BytesRef(InetAddressPoint.encode(address));
                 context.getOffSetContext().recordOffset(offsetsFieldName, sortableValue);
             } else {