diff --git a/Dockerfile b/Dockerfile
index 59f9441..24e9d96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 # HAProxy image with certbot for certificate generation and renewal
 #
 # -----------------------------------------------------------------------------------------------
-FROM haproxy:2.9-alpine
+FROM haproxy:3.2-alpine
 LABEL maintainer="support@openremote.io"
 
 USER root
diff --git a/haproxy.cfg b/haproxy.cfg
index d415862..11f21a8 100644
--- a/haproxy.cfg
+++ b/haproxy.cfg
@@ -128,7 +128,7 @@ listen mqtt
 
     .if defined(MQTT_RATE_LIMIT)
        # Rate limiting
-       acl too_fast fe_sess_rate ge "${MQTT_RATE_LIMIT}"
+       acl too_fast fe_sess_rate ge "${MQTT_RATE_LIMIT-0}"
        tcp-request connection reject if too_fast
     .endif