diff --git a/rabbitmq/files/rabbitmq.config b/rabbitmq/files/rabbitmq.config
index 4cef5ca..799153b 100644
--- a/rabbitmq/files/rabbitmq.config
+++ b/rabbitmq/files/rabbitmq.config
@@ -30,10 +30,10 @@
                              {%- if server.ssl.ciphers is defined %}
                              {ciphers,[ {{ server.ssl.ciphers | join("', '") }} ]},
                              {%- endif %}
-                             {fail_if_no_peer_cert,false}]}
-
+                             {fail_if_no_peer_cert,{{ server.get('x509', {'enabled': False}).enabled |lower }}}
+                            ]
+              }
               {% endif %}
-
              ]
     }
     {%- if 'rabbitmq_management' in server.plugins %},