diff --git a/bbb-webhooks/messageMapping.js b/bbb-webhooks/messageMapping.js
index a2c72684b4c5ed4b8e3967d7be00161efc1e20c2..30842d80ff16d87aa3f3a7aa0481e1441377a38c 100644
--- a/bbb-webhooks/messageMapping.js
+++ b/bbb-webhooks/messageMapping.js
@@ -143,18 +143,23 @@ module.exports = class MessageMapping {
         "user":{
           "internal-user-id": msgHeader.userId,
           "external-user-id": extId,
-          "sharing-mic": msgBody.muted,
           "name": msgBody.name,
           "role": msgBody.role,
           "presenter": msgBody.presenter,
-          "stream": msgBody.stream,
-          "listening-only": msgBody.listenOnly
+          "stream": msgBody.stream
         }
       },
       "event":{
         "ts": Date.now()
       }
     };
+    if (this.mappedObject.data["id"] === "user-audio-voice-enabled") {
+      this.mappedObject.data["attributes"]["user"]["listening-only"] = msgBody.listenOnly;
+      this.mappedObject.data["attributes"]["user"]["sharing-mic"] = ! msgBody.listenOnly;
+    } else if (this.mappedObject.data["id"] === "user-audio-voice-disabled") {
+      this.mappedObject.data["attributes"]["user"]["listening-only"] = false;
+      this.mappedObject.data["attributes"]["user"]["sharing-mic"] = false;
+    }
     this.mappedMessage = JSON.stringify(this.mappedObject);
     Logger.info("[MessageMapping] Mapped message:", this.mappedMessage);
   }