diff --git a/templates/trove-guestagent.conf.erb b/templates/trove-guestagent.conf.erb
index c30ff911..6e1b6fa0 100644
--- a/templates/trove-guestagent.conf.erb
+++ b/templates/trove-guestagent.conf.erb
@@ -75,12 +75,8 @@ backup_segment_max_size = 2147483648
 <%- if @rabbit_ha_queues and @rabbit_ha_queues != "<SERVICE DEFAULT>" -%>
 rabbit_ha_queues=<%= @rabbit_ha_queues %>
 <%- else -%>
-<%- if @rabbit_hosts and @rabbit_hosts != "<SERVICE DEFAULT>" -%>
-rabbit_ha_queues=true
-<%- else -%>
 #rabbit_ha_queues=false
 <%- end -%>
-<%- end -%>
 
 <%- if @amqp_durable_queues and @amqp_durable_queues != "<SERVICE DEFAULT>" -%>
 amqp_durable_queues=<%= @amqp_durable_queues %>