diff --git a/lib/Client.js b/lib/Client.js
index 0858f3c14..ad8eede20 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -628,7 +628,7 @@ class Client extends EventEmitter {
     * @arg {Boolean} [options.tts=false] Whether the message should be a TTS message or not
     * @arg {Boolean} [options.wait=false] Whether to wait for the server to confirm the message create or not
     * @arg {Boolean} [options.disableEveryone] Whether to filter @everyone/@here or not (overrides default)
-    * @returns {Promise}
+    * @returns {Promise<Message?>}
     */
     executeWebhook(webhookID, token, options) {
         if(!options.content && !options.file && !options.embeds) {
@@ -643,7 +643,7 @@ class Client extends EventEmitter {
             username: options.username,
             avatar_url: options.avatarURL,
             tts: options.tts
-        }, options.file);
+        }, options.file).then((response) => options.wait ? new Message(response, this) : undefined);
     }
 
     /**