diff --git a/src/structures/Message.js b/src/structures/Message.js
index 11ee800..fa5f2ae 100644
--- a/src/structures/Message.js
+++ b/src/structures/Message.js
@@ -1060,12 +1060,19 @@ class Message extends Base {
   }
 
   /**
-   * Click specific button
-   * @param {MessageButton|string} button Button ID
+   * Click specific button or automatically if only one.
+   * @param {MessageButton|string|null} button Button ID
    * @returns {Promise<InteractionResponse>}
    */
   clickButton(button) {
     let buttonID;
+    if (!button) {
+      if (this.components.length == 1 && this.components[0].type == 'ACTION_ROW') {
+        if (this.components[0].components.length == 1) {
+          buttonID = this.components[0].components[0].customId;
+        }
+      }
+    }
     if (button instanceof MessageButton) button = button.customId;
     if (typeof button === 'string') buttonID = button;
     if (!buttonID) {
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 53f24db..be66750 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -1974,7 +1974,7 @@ export class Message<Cached extends boolean = boolean> extends Base {
   // Added
   public markUnread(): Promise<boolean>;
   public markRead(): Promise<boolean>;
-  public clickButton(button: MessageButton | string): Promise<InteractionResponse>;
+  public clickButton(button: MessageButton | string | null): Promise<InteractionResponse>;
   public selectMenu(menuID: string, options: string[]): Promise<InteractionResponse>;
   public selectMenu(options: string[]): Promise<InteractionResponse>;
   public contextMenu(botID: Snowflake, commandName: string): Promise<InteractionResponse>;