diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8b148b6f5cb..1b5f9a062b8 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -65,6 +65,7 @@ https://github.com/elastic/beats/compare/v5.1.1...master[Check the HEAD diff]
 
 *Heartbeat*
 - Add default ports in HTTP monitor. {pull}3924[3924]
+- Use IP type of elasticsearch for ip field. {pull}3926[3926]
 
 *Metricbeat*
 
diff --git a/heartbeat/_meta/fields.yml b/heartbeat/_meta/fields.yml
index 536927272b3..763874c139b 100644
--- a/heartbeat/_meta/fields.yml
+++ b/heartbeat/_meta/fields.yml
@@ -35,7 +35,7 @@
         Service url used by monitor.
 
     - name: ip
-      type: keyword
+      type: ip
       description: >
         IP of service being monitored. If service is monitored by hostname,
         the `ip` field contains the resolved ip address for the current host.
diff --git a/heartbeat/docs/fields.asciidoc b/heartbeat/docs/fields.asciidoc
index a8c71307e11..e6f5e37819a 100644
--- a/heartbeat/docs/fields.asciidoc
+++ b/heartbeat/docs/fields.asciidoc
@@ -217,7 +217,7 @@ Service url used by monitor.
 [float]
 === ip
 
-type: keyword
+type: ip
 
 IP of service being monitored. If service is monitored by hostname, the `ip` field contains the resolved ip address for the current host.