diff --git a/monasca_api/common/messaging/kafka_publisher.py b/monasca_api/common/messaging/kafka_publisher.py
index 1cb28eba9..21eb9d250 100644
--- a/monasca_api/common/messaging/kafka_publisher.py
+++ b/monasca_api/common/messaging/kafka_publisher.py
@@ -20,7 +20,6 @@ from oslo_log import log
 from monasca_api.common.messaging import exceptions
 from monasca_api.common.messaging import publisher
 
-
 LOG = log.getLogger(__name__)
 
 
@@ -44,8 +43,10 @@ class KafkaPublisher(publisher.Publisher):
         self.partitions = cfg.CONF.kafka.partitions
         self.drop_data = cfg.CONF.kafka.drop_data
 
+        config = {'queue.buffering.max.messages':
+                  cfg.CONF.kafka.queue_buffering_max_messages}
         self._producer = client_factory.get_kafka_producer(
-            self.uri, cfg.CONF.kafka.legacy_kafka_client_enabled)
+            self.uri, cfg.CONF.kafka.legacy_kafka_client_enabled, **config)
 
     def close(self):
         pass