diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 5b86596cb12b..55c9053daec0 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -53,6 +53,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 - De dot keys in jolokia/jmx metricset to prevent collisions. {pull}5957[5957]
 - Support to optionally 'de dot' keys in http/json metricset to prevent collisions. {pull}5970[5970]
 - De dot keys in kubernetes/event metricset to prevent collisions. {pull}6203[6203]
+- Fix the default configuration for Logstash to include the default port. {pull}6279[6279]
 
 *Packetbeat*
 
diff --git a/metricbeat/docs/modules/logstash.asciidoc b/metricbeat/docs/modules/logstash.asciidoc
index 4bc4f3417dd2..956991321be7 100644
--- a/metricbeat/docs/modules/logstash.asciidoc
+++ b/metricbeat/docs/modules/logstash.asciidoc
@@ -24,7 +24,7 @@ metricbeat.modules:
   metricsets: ["node", "node_stats"]
   enabled: false
   period: 10s
-  hosts: ["localhost"]
+  hosts: ["localhost:9600"]
 
 ----
 
diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml
index c8a610619d50..e71add44d058 100644
--- a/metricbeat/metricbeat.reference.yml
+++ b/metricbeat/metricbeat.reference.yml
@@ -312,7 +312,7 @@ metricbeat.modules:
   metricsets: ["node", "node_stats"]
   enabled: false
   period: 10s
-  hosts: ["localhost"]
+  hosts: ["localhost:9600"]
 
 
 #------------------------------ Memcached Module -----------------------------
diff --git a/metricbeat/module/logstash/_meta/config.yml b/metricbeat/module/logstash/_meta/config.yml
index 58c24736632c..7d1e8fc910ec 100644
--- a/metricbeat/module/logstash/_meta/config.yml
+++ b/metricbeat/module/logstash/_meta/config.yml
@@ -2,5 +2,5 @@
   metricsets: ["node", "node_stats"]
   enabled: false
   period: 10s
-  hosts: ["localhost"]
+  hosts: ["localhost:9600"]
 
diff --git a/metricbeat/modules.d/logstash.yml.disabled b/metricbeat/modules.d/logstash.yml.disabled
index 58c24736632c..7d1e8fc910ec 100644
--- a/metricbeat/modules.d/logstash.yml.disabled
+++ b/metricbeat/modules.d/logstash.yml.disabled
@@ -2,5 +2,5 @@
   metricsets: ["node", "node_stats"]
   enabled: false
   period: 10s
-  hosts: ["localhost"]
+  hosts: ["localhost:9600"]