diff --git a/README.rst b/README.rst
index b011af8..5cae8aa 100644
--- a/README.rst
+++ b/README.rst
@@ -18,6 +18,8 @@
     rabbitmq:
       server:
         enabled: true
+        memory:
+          vm_high_watermark: 0.4
         bind:
           address: 0.0.0.0
           port: 5672
diff --git a/rabbitmq/files/telegraf.conf b/rabbitmq/files/telegraf.conf
index 376560f..bb4fc41 100644
--- a/rabbitmq/files/telegraf.conf
+++ b/rabbitmq/files/telegraf.conf
@@ -3,6 +3,12 @@
   url = "{{ values.url }}"
   username = "{{ values.username }}"
   password = "{{ values.password }}"
+{%- if values.header_timeout is defined %}
+  header_timeout = "{{ values.header_timeout }}"
+{%- endif %}
+{%- if values.client_timeout is defined %}
+  client_timeout = "{{ values.client_timeout }}"
+{%- endif %}
 {%- if values.nodes is defined %}
   nodes = {{ values.nodes|json }}
 {%- endif %}
diff --git a/rabbitmq/meta/telegraf.yml b/rabbitmq/meta/telegraf.yml
index ace1586..e185849 100644
--- a/rabbitmq/meta/telegraf.yml
+++ b/rabbitmq/meta/telegraf.yml
@@ -9,6 +9,8 @@
       username: {{ server.admin.name }}
       password: >-
         {{ server.admin.password }}
+      header_timeout: 3s
+      client_timeout: 4s
       nodes: [ "rabbit@{{ grains.host }}" ]
       queue_name_exclude: [ "*" ]
       # Measurement filtering