diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/api/v2/events/discord/DiscordMessageEvent.java b/EssentialsDiscord/src/main/java/net/essentialsx/api/v2/events/discord/DiscordMessageEvent.java
index c9f5f4765..72700c688 100644
--- a/EssentialsDiscord/src/main/java/net/essentialsx/api/v2/events/discord/DiscordMessageEvent.java
+++ b/EssentialsDiscord/src/main/java/net/essentialsx/api/v2/events/discord/DiscordMessageEvent.java
@@ -1,6 +1,7 @@
 package net.essentialsx.api.v2.events.discord;
 
 import net.essentialsx.api.v2.services.discord.MessageType;
+import org.bukkit.Bukkit;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
@@ -10,6 +11,8 @@ import java.util.UUID;
 
 /**
  * Fired before a message is about to be sent to a Discord channel.
+ * <p>
+ * Note: This event has no guarantee of the thread it is fired on, please use {@link #isAsynchronous()}} to see if this event is off the main Bukkit thread.
  */
 public class DiscordMessageEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();
@@ -40,6 +43,7 @@ public class DiscordMessageEvent extends Event implements Cancellable {
      * @param uuid               The UUID of the player which caused this event or null if this wasn't a player triggered event.
      */
     public DiscordMessageEvent(final MessageType type, final String message, final boolean allowGroupMentions, final String avatarUrl, final String name, final UUID uuid) {
+        super(!Bukkit.isPrimaryThread());
         this.type = type;
         this.message = message;
         this.allowGroupMentions = allowGroupMentions;
diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
index 31dbf7946..9de36d81e 100644
--- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
+++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/JDADiscordService.java
@@ -258,11 +258,7 @@ public class JDADiscordService implements DiscordService, IEssentialsModule {
             logger.warning("Sending message to channel \"" + type.getKey() + "\" which is an unregistered type! If you are a plugin author, you should be registering your MessageType before using them.");
         }
         final DiscordMessageEvent event = new DiscordMessageEvent(type, FormatUtil.stripFormat(message), allowGroupMentions);
-        if (Bukkit.getServer().isPrimaryThread()) {
-            Bukkit.getPluginManager().callEvent(event);
-        } else {
-            Bukkit.getScheduler().runTask(plugin, () -> Bukkit.getPluginManager().callEvent(event));
-        }
+        Bukkit.getPluginManager().callEvent(event);
     }
 
     @Override
diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/util/DiscordUtil.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/util/DiscordUtil.java
index baf4052ff..33737e916 100644
--- a/EssentialsDiscord/src/main/java/net/essentialsx/discord/util/DiscordUtil.java
+++ b/EssentialsDiscord/src/main/java/net/essentialsx/discord/util/DiscordUtil.java
@@ -214,6 +214,6 @@ public final class DiscordUtil {
             return;
         }
 
-        jda.getPlugin().getEss().scheduleGlobalDelayedTask(() -> Bukkit.getPluginManager().callEvent(event));
+        Bukkit.getPluginManager().callEvent(event);
     }
 }