diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index e68d087d77e2..d1040844efdf 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -82,6 +82,7 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff]
 - Include ip and boolean type when generating index pattern. {pull}10995[10995]
 - Using an environment variable for the password when enrolling a beat will now raise an error if the variable doesn't exist. {pull}10936[10936]
 - Cancelling enrollment of a beat will not enroll the beat. {issue}10150[10150]
+- Remove IP fields from default_field in Elasticsearch template. {pull}11399[11399]
 
 *Auditbeat*
 
diff --git a/libbeat/template/processor.go b/libbeat/template/processor.go
index 48897c2bf4e3..db0682ef9f0c 100644
--- a/libbeat/template/processor.go
+++ b/libbeat/template/processor.go
@@ -100,7 +100,7 @@ func (p *Processor) Process(fields common.Fields, path string, output common.Map
 		}
 
 		switch field.Type {
-		case "", "keyword", "text", "ip":
+		case "", "keyword", "text":
 			addToDefaultFields(&field)
 		}