diff --git a/discord/emoji.py b/discord/emoji.py
index 42f4183cd..0b66d1795 100644
--- a/discord/emoji.py
+++ b/discord/emoji.py
@@ -170,7 +170,8 @@ class Emoji(Hashable):
     @property
     def url(self):
         """Returns a URL version of the emoji."""
-        return "https://cdn.discordapp.com/emojis/{0.id}.png".format(self)
+        _format = 'gif' if self.animated else 'png'
+        return "https://cdn.discordapp.com/emojis/{0.id}.{1}".format(self, _format)
 
     @property
     def roles(self):