diff --git a/webapp/titanembeds/EmojiParser.py b/webapp/titanembeds/EmojiParser.py
index 70d6ffb..45d369e 100644
--- a/webapp/titanembeds/EmojiParser.py
+++ b/webapp/titanembeds/EmojiParser.py
@@ -5,13 +5,15 @@ def parseEmoji(textToParse, guild_id):
     _endpoint = "/guilds/{guild_id}".format(guild_id=guild_id)
     _method = "GET"
     response = discord_api.request(_method, _endpoint)
+    if 'code' not in response['content']:
+        return textToParse
     emojis = []
-    emojis = re.findall(":(.*?):", textToParse)
+    emojis = re.findall("<:(.*?):(.*)?>", textToParse)
     newText = textToParse
-    for emoji in response['emojis']:
+    for emoji in response['content']['emojis']:
     	name = emoji['name']
     	emojiId = emoji['id']
     	for emoji2 in emojis:
     		if name.lower is emoji2.replace(":", "").lower():
-    			newText = newText.replace(":{}:".format(name), "<img src='https://cdn.discordapp.com/emojis/{}.png'></img>".format(id))
-    return newText
\ No newline at end of file
+    			newText = newText.replace("<:{}}:{}>".format(name, emojiId), "<img src='https://cdn.discordapp.com/emojis/{}.png'></img>".format(emojiId))
+    return newText