diff --git a/deployment_scripts/puppet/modules/lma_collector/files/collectd/rabbitmq_info.py b/deployment_scripts/puppet/modules/lma_collector/files/collectd/rabbitmq_info.py
index 48753ca4f..8544a013e 100644
--- a/deployment_scripts/puppet/modules/lma_collector/files/collectd/rabbitmq_info.py
+++ b/deployment_scripts/puppet/modules/lma_collector/files/collectd/rabbitmq_info.py
@@ -159,9 +159,15 @@ class RabbitMqPlugin(base.Base):
             stats['messages'] += ctl_stats[1]
             stats['memory'] += ctl_stats[2]
             stats['consumers'] += ctl_stats[3]
-            stats['%s.messages' % queue_name] = ctl_stats[1]
-            stats['%s.memory' % queue_name] = ctl_stats[2]
-            stats['%s.consumers' % queue_name] = ctl_stats[3]
+            # The following three lines are commented out because per-queue
+            # metrics may result in collectd dropping metrics due to
+            # over-flooding. See bug
+            # https://bugs.launchpad.net/lma-toolchain/+bug/1549721
+            # To reactivate this feature just uncomment them.
+            #stats['%s.messages' % queue_name] = ctl_stats[1]
+            #stats['%s.memory' % queue_name] = ctl_stats[2]
+            #stats['%s.consumers' % queue_name] = ctl_stats[3]
+
             # we need to check if the list of synchronised slaves is
             # equal to the list of slaves.
             try:
diff --git a/doc/source/user/releases.rst b/doc/source/user/releases.rst
index e288c42a7..567c28e65 100644
--- a/doc/source/user/releases.rst
+++ b/doc/source/user/releases.rst
@@ -28,6 +28,9 @@ Version 0.8.1
   * Avoid spawning several hekad processes (`#1561109
     <https://bugs.launchpad.net/lma-toolchain/+bug/1561109>`_).
 
+  * Remove the monitoring of individual queue of RabbitMQ (`#1549721
+    <https://bugs.launchpad.net/lma-toolchain/+bug/1549721>`_).
+
 * Changes
 
   * Upgrade to Heka 0.10.0