diff --git a/lib/BetterDiscord.js b/lib/BetterDiscord.js
index c2ed8b7..e741c5e 100644
--- a/lib/BetterDiscord.js
+++ b/lib/BetterDiscord.js
@@ -779,7 +779,7 @@ function parseEmoteData(extData, data) {
 
             data = JSON.parse(data);
 
-            var channels = data;
+            /*var channels = data;
             for(var channel in channels) {
                 var emotes = channels[channel]["emotes"];
                 for(var i = 0 ; i < emotes.length ; i++) {
@@ -789,6 +789,15 @@ function parseEmoteData(extData, data) {
                 }
             }
 
+            returnData = JSON.stringify(returnData);*/
+
+            var keys = Object.keys(data);
+            keys.forEach(key => {
+                var emotes = data[key].emotes;
+                emotes.forEach(emote => {
+                    returnData[emote.code] = emote.id;
+                });
+            });
             returnData = JSON.stringify(returnData);
             break;
         case 2: //FFZ Emotes