diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java
index a1b0f170b9f..3bd94db4600 100644
--- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java
+++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java
@@ -82,6 +82,7 @@ public class HistoryTemplateTransformMappingsTests extends AbstractWatcherIntegr
             // time might have rolled over to a new day, thus we need to check that this field exists only in one of the history indices
             List<Boolean> payloadNulls = response.mappings().values().stream()
                     .map(map -> map.get(SINGLE_MAPPING_NAME))
+                    .filter(Objects::nonNull)
                     .map(map -> map.get("result.actions.transform.payload"))
                     .filter(Objects::nonNull)
                     .map(GetFieldMappingsResponse.FieldMappingMetaData::isNull)