diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index f5a2b34dd..a6057ecd2 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -24,7 +24,7 @@
 
   ## Telegraf will cache metric_buffer_limit metrics for each output, and will
   ## flush this buffer on a successful write.
-  metric_buffer_limit = 10000
+  metric_buffer_limit = 1000
   ## Flush the buffer whenever full, regardless of flush_interval.
   flush_buffer_when_full = true
 
diff --git a/etc/telegraf_windows.conf b/etc/telegraf_windows.conf
index 7e66cb209..9ce067c39 100644
--- a/etc/telegraf_windows.conf
+++ b/etc/telegraf_windows.conf
@@ -24,7 +24,7 @@
 
   ## Telegraf will cache metric_buffer_limit metrics for each output, and will
   ## flush this buffer on a successful write.
-  metric_buffer_limit = 10000
+  metric_buffer_limit = 1000
   ## Flush the buffer whenever full, regardless of flush_interval.
   flush_buffer_when_full = true
 
diff --git a/internal/config/config.go b/internal/config/config.go
index a7a9eaab4..f64e0a56a 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -159,7 +159,7 @@ var header = `# Telegraf Configuration
 
   ## Telegraf will cache metric_buffer_limit metrics for each output, and will
   ## flush this buffer on a successful write.
-  metric_buffer_limit = 10000
+  metric_buffer_limit = 1000
   ## Flush the buffer whenever full, regardless of flush_interval.
   flush_buffer_when_full = true
 
diff --git a/internal/models/running_output.go b/internal/models/running_output.go
index 37b479dfb..9d111c757 100644
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -10,7 +10,7 @@ import (
 
 const (
 	// Default number of metrics kept between flushes.
-	DEFAULT_METRIC_BUFFER_LIMIT = 10000
+	DEFAULT_METRIC_BUFFER_LIMIT = 1000
 
 	// Limit how many full metric buffers are kept due to failed writes.
 	FULL_METRIC_BUFFERS_LIMIT = 100