diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 174eec9abf70..28bfc50dfd15 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -268,6 +268,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 - Set default metricsets in vSphere module. {pull}6676[6676]
 - Set `status` as default metricset in Apache module. {pull}6673[6673]
 - Set `namespace` as default metricset in Aerospike module. {pull}6669[6669]
+- Set `service` as default metricset in Windows module. {pull}6675[6675]
 
 *Packetbeat*
 
diff --git a/metricbeat/docs/modules/windows.asciidoc b/metricbeat/docs/modules/windows.asciidoc
index 2943f320d3c5..3f09f137a649 100644
--- a/metricbeat/docs/modules/windows.asciidoc
+++ b/metricbeat/docs/modules/windows.asciidoc
@@ -7,7 +7,8 @@ This file is generated! See scripts/docs_collector.py
 
 beta[]
 
-This is the Windows module.
+This is the Windows module. It collects metrics from Windows systems,
+by default metricset `service` is enabled.
 
 
 [float]
@@ -20,12 +21,6 @@ in <<configuration-metricbeat>>. Here is an example configuration:
 ----
 metricbeat.modules:
 - module: windows
-  metricsets: ["perfmon"]
-  period: 10s
-  perfmon.counters:
-
-- module: windows
-  metricsets: ["service"]
   period: 60s
 ----
 
diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml
index 8422354127d9..22f5a8290970 100644
--- a/metricbeat/metricbeat.reference.yml
+++ b/metricbeat/metricbeat.reference.yml
@@ -493,11 +493,18 @@ metricbeat.modules:
 #------------------------------- Windows Module ------------------------------
 - module: windows
   metricsets: ["perfmon"]
+  enabled: true
   period: 10s
+  perfmon.ignore_non_existent_counters: true
   perfmon.counters:
+  #  - instance_label: processor.name
+  #    instance_name: total
+  #    measurement_label: processor.time.total.pct
+  #    query: '\Processor Information(_Total)\% Processor Time'
 
 - module: windows
   metricsets: ["service"]
+  enabled: true
   period: 60s
 
 #------------------------------ ZooKeeper Module -----------------------------
diff --git a/metricbeat/module/windows/_meta/config.reference.yml b/metricbeat/module/windows/_meta/config.reference.yml
new file mode 100644
index 000000000000..d891fe62ec53
--- /dev/null
+++ b/metricbeat/module/windows/_meta/config.reference.yml
@@ -0,0 +1,15 @@
+- module: windows
+  metricsets: ["perfmon"]
+  enabled: true
+  period: 10s
+  perfmon.ignore_non_existent_counters: true
+  perfmon.counters:
+  #  - instance_label: processor.name
+  #    instance_name: total
+  #    measurement_label: processor.time.total.pct
+  #    query: '\Processor Information(_Total)\% Processor Time'
+
+- module: windows
+  metricsets: ["service"]
+  enabled: true
+  period: 60s
diff --git a/metricbeat/module/windows/_meta/config.yml b/metricbeat/module/windows/_meta/config.yml
index 2c56fe8e9415..866e00010f86 100644
--- a/metricbeat/module/windows/_meta/config.yml
+++ b/metricbeat/module/windows/_meta/config.yml
@@ -1,8 +1,2 @@
 - module: windows
-  metricsets: ["perfmon"]
-  period: 10s
-  perfmon.counters:
-
-- module: windows
-  metricsets: ["service"]
   period: 60s
diff --git a/metricbeat/module/windows/_meta/docs.asciidoc b/metricbeat/module/windows/_meta/docs.asciidoc
index 020e508ba08c..3a14b2eb03f7 100644
--- a/metricbeat/module/windows/_meta/docs.asciidoc
+++ b/metricbeat/module/windows/_meta/docs.asciidoc
@@ -1 +1,2 @@
-This is the Windows module.
+This is the Windows module. It collects metrics from Windows systems,
+by default metricset `service` is enabled.
diff --git a/metricbeat/module/windows/perfmon/perfmon.go b/metricbeat/module/windows/perfmon/perfmon.go
index c7cef78c1d33..0c352eb00984 100644
--- a/metricbeat/module/windows/perfmon/perfmon.go
+++ b/metricbeat/module/windows/perfmon/perfmon.go
@@ -28,9 +28,7 @@ type Config struct {
 }
 
 func init() {
-	if err := mb.Registry.AddMetricSet("windows", "perfmon", New); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("windows", "perfmon", New)
 }
 
 type MetricSet struct {
diff --git a/metricbeat/module/windows/service/service.go b/metricbeat/module/windows/service/service.go
index c9b9f15e17ec..1596e199a14f 100644
--- a/metricbeat/module/windows/service/service.go
+++ b/metricbeat/module/windows/service/service.go
@@ -11,9 +11,9 @@ import (
 // init registers the MetricSet with the central registry.
 // The New method will be called after the setup of the module and before starting to fetch data
 func init() {
-	if err := mb.Registry.AddMetricSet("windows", "service", New); err != nil {
-		panic(err)
-	}
+	mb.Registry.MustAddMetricSet("windows", "service", New,
+		mb.DefaultMetricSet(),
+	)
 }
 
 // MetricSet type defines all fields of the MetricSet
diff --git a/metricbeat/modules.d/windows.yml.disabled b/metricbeat/modules.d/windows.yml.disabled
index 2c56fe8e9415..866e00010f86 100644
--- a/metricbeat/modules.d/windows.yml.disabled
+++ b/metricbeat/modules.d/windows.yml.disabled
@@ -1,8 +1,2 @@
 - module: windows
-  metricsets: ["perfmon"]
-  period: 10s
-  perfmon.counters:
-
-- module: windows
-  metricsets: ["service"]
   period: 60s