diff --git a/bridge/api/api.go b/bridge/api/api.go
index 0ccd85b6..1efe7558 100644
--- a/bridge/api/api.go
+++ b/bridge/api/api.go
@@ -33,7 +33,9 @@ func New(cfg *bridge.Config) bridge.Bridger {
 	e.HideBanner = true
 	e.HidePort = true
 	b.Messages = ring.Ring{}
-	b.Messages.SetCapacity(b.GetInt("Buffer"))
+	if b.GetInt("Buffer") != 0 {
+		b.Messages.SetCapacity(b.GetInt("Buffer"))
+	}
 	if b.GetString("Token") != "" {
 		e.Use(middleware.KeyAuth(func(key string, c echo.Context) (bool, error) {
 			return key == b.GetString("Token"), nil
diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index 0ec55962..76875aca 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -1214,6 +1214,7 @@ ShowTopicChange=false
 BindAddress="127.0.0.1:4242"
 
 #Amount of messages to keep in memory
+#OPTIONAL (library default 10)
 Buffer=1000
 
 #Bearer token used for authentication