diff --git a/server/consumer.go b/server/consumer.go
index 68058dad..e9ad5543 100644
--- a/server/consumer.go
+++ b/server/consumer.go
@@ -351,7 +351,7 @@ func (mset *stream) addConsumerWithAssignment(config *ConsumerConfig, oname stri
 		config.MaxDeliver = -1
 	}
 	// Set proper default for max ack pending if we are ack explicit and none has been set.
-	if config.AckPolicy == AckExplicit && config.MaxAckPending == 0 {
+	if (config.AckPolicy == AckExplicit || config.AckPolicy == AckAll) && config.MaxAckPending == 0 {
 		config.MaxAckPending = JsDefaultMaxAckPending
 	}