diff --git a/twitch/customEmoteWall.js b/twitch/customEmoteWall.js
index c437c7f..bdf81f8 100644
--- a/twitch/customEmoteWall.js
+++ b/twitch/customEmoteWall.js
@@ -53,15 +53,15 @@
             if (!action) {
                 $.say($.whisperPrefix(sender) + $.lang.get('ew.help', ' Use "!ew [rain | firework | volcano | bomb | explosion] emote" to render emotes.'));
             } else if (action.equalsIgnoreCase('rain')) {
-                sendData('rain',event.getTags().get('emotes').split('/'), getNoTwitchEmotes(event,event.getMessage()).split(' '))
+                sendData('rain',event.getTags().get('emotes').split('/'), getNoTwitchEmotes(event,event.args.join(' ')).split(' '))
             } else if (action.equalsIgnoreCase('firework')) {
-                sendData('firework',event.getTags().get('emotes').split('/'), getNoTwitchEmotes(event,event.getMessage()).split(' '))
+                sendData('firework',event.getTags().get('emotes').split('/'), getNoTwitchEmotes(event,event.args.join(' ')).split(' '))
             } else if (action.equalsIgnoreCase('volcano')) {
-                sendData('volcano',event.getTags().get('emotes').split('/'), getNoTwitchEmotes(event,event.getMessage()).split(' '))
+                sendData('volcano',event.getTags().get('emotes').split('/'), getNoTwitchEmotes(event,event.args.join(' ')).split(' '))
             } else if (action.equalsIgnoreCase('bomb')) {
-                sendData('bomb',event.getTags().get('emotes').split('/'), getNoTwitchEmotes(event,event.getMessage()).split(' '))
+                sendData('bomb',event.getTags().get('emotes').split('/'), getNoTwitchEmotes(event,event.args.join(' ')).split(' '))
             } else if (action.equalsIgnoreCase('explosion')) {
-                sendData('explosion',event.getTags().get('emotes').split('/'), getNoTwitchEmotes(event,event.getMessage()).split(' '))
+                sendData('explosion',event.getTags().get('emotes').split('/'), getNoTwitchEmotes(event,event.args.join(' ')).split(' '))
             } else {
                 $.say($.whisperPrefix(sender) + $.lang.get('ew.help', ' Use "!ew [rain | firework | volcano | bomb | explosion] emote" to render emotes.'));
             }