diff --git a/src/custom_modules/HestiaClasses.js b/src/custom_modules/HestiaClasses.js
index 54066dc..ad768e6 100644
--- a/src/custom_modules/HestiaClasses.js
+++ b/src/custom_modules/HestiaClasses.js
@@ -1,3 +1,4 @@
+const EventEmitter = require('events');
 const mqtt = require('mqtt');
 
 module.exports = {
@@ -44,10 +45,10 @@ module.exports = {
         };
     },
     // Communicator class
-    Communicator: class Communicator {
+    Communicator: class Communicator extends EventEmitter {
         constructor(state) {
+            super();
             this.publisher = state.publisher;
-            return this;
         }
 
         init(state, config) {