diff --git a/config.py b/config.py
index f81b72f11..08b340041 100644
--- a/config.py
+++ b/config.py
@@ -164,6 +164,7 @@
         },
         "queue": {
             "Activemq": "ActiveMQ",
+            "Emqx": "EMQX",
             "Rabbitmq": "RabbitMQ",
             "Zeromq": "ZeroMQ",
         },
diff --git a/diagrams/onprem/queue.py b/diagrams/onprem/queue.py
index a8ffd6536..7a54649c1 100644
--- a/diagrams/onprem/queue.py
+++ b/diagrams/onprem/queue.py
@@ -16,6 +16,10 @@ class Celery(_Queue):
     _icon = "celery.png"
 
 
+class Emqx(_Queue):
+    _icon = "emqx.png"
+
+
 class Kafka(_Queue):
     _icon = "kafka.png"
 
@@ -35,5 +39,6 @@ class Zeromq(_Queue):
 # Aliases
 
 ActiveMQ = Activemq
+EMQX = Emqx
 RabbitMQ = Rabbitmq
 ZeroMQ = Zeromq
diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index 81e617a69..34eab2cf0 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -479,6 +479,9 @@ Node classes list of onprem provider.
 <img width="30" src="/img/resources/onprem/queue/celery.png" alt="Celery" style="float: left; padding-right: 5px;" >
 **diagrams.onprem.queue.Celery**
 
+<img width="30" src="/img/resources/onprem/queue/emqx.png" alt="Emqx" style="float: left; padding-right: 5px;" >
+**diagrams.onprem.queue.Emqx**, **EMQX** (alias)
+
 <img width="30" src="/img/resources/onprem/queue/kafka.png" alt="Kafka" style="float: left; padding-right: 5px;" >
 **diagrams.onprem.queue.Kafka**
 
diff --git a/resources/onprem/queue/emqx.png b/resources/onprem/queue/emqx.png
new file mode 100644
index 000000000..b2776cfa1
Binary files /dev/null and b/resources/onprem/queue/emqx.png differ
diff --git a/website/static/img/resources/onprem/queue/emqx.png b/website/static/img/resources/onprem/queue/emqx.png
new file mode 100644
index 000000000..b2776cfa1
Binary files /dev/null and b/website/static/img/resources/onprem/queue/emqx.png differ