diff --git a/secondary/common/config.go b/secondary/common/config.go
index 2c78142f2..26cb08e01 100644
--- a/secondary/common/config.go
+++ b/secondary/common/config.go
@@ -366,10 +366,10 @@ var SystemConfig = Config{
 		false, // case-insensitive
 	},
 	"projector.dataport.bufferTimeout": ConfigValue{
-		1, // 1ms
+		25, // 25ms
 		"timeout in milliseconds, to flush vbucket-mutations from, " +
 			"endpoint, does not affect existing feeds.",
-		1,     // 1ms
+		25,    // 25ms
 		false, // mutable
 		false, // case-insensitive
 	},
diff --git a/secondary/dataport/endpoint.go b/secondary/dataport/endpoint.go
index 51da152eb..1275e99f8 100644
--- a/secondary/dataport/endpoint.go
+++ b/secondary/dataport/endpoint.go
@@ -368,7 +368,7 @@ loop:
 				})
 
 				messageCount++ // count queued up mutations.
-				if messageCount > endpoint.bufferSize {
+				if messageCount > endpoint.bufferSize || time.Since(lastActiveTime) > time.Duration(1*time.Millisecond) {
 					if err := flushBuffers(); err != nil {
 						break loop
 					}