diff --git a/disco/api/client.py b/disco/api/client.py
index b63eeed..ac83dea 100644
--- a/disco/api/client.py
+++ b/disco/api/client.py
@@ -239,7 +239,10 @@ class APIClient(LoggingClass):
         self.http(Routes.WEBHOOKS_TOKEN_DLEETE, dict(webhook=webhook, token=token))
 
     def webhooks_token_execute(self, webhook, token, data, wait=False):
-        self.http(
+        obj = self.http(
             Routes.WEBHOOKS_TOKEN_EXECUTE,
             dict(webhook=webhook, token=token),
             json=optional(**data), params={'wait': int(wait)})
+
+        if wait:
+            return Message.create(self.client, obj.json())
diff --git a/disco/types/webhook.py b/disco/types/webhook.py
index da0aadc..3afdd3f 100644
--- a/disco/types/webhook.py
+++ b/disco/types/webhook.py
@@ -32,7 +32,7 @@ class Webhook(SlottedModel):
         else:
             return self.client.api.webhooks_modify(self.id, name, avatar)
 
-    def execute(self, content=None, username=None, avatar_url=None, tts=False, file=None, embeds=None, wait=False):
+    def execute(self, content=None, username=None, avatar_url=None, tts=False, file=None, embeds=[], wait=False):
         return self.client.api.webhooks_token_execute(self.id, self.token, {
             'content': content,
             'username': username,