diff --git a/craftbukkit/src/main/java/vakiliner/chatcomponentapi/craftbukkit/BukkitParser.java b/craftbukkit/src/main/java/vakiliner/chatcomponentapi/craftbukkit/BukkitParser.java
index 1ce440e..a1bac59 100644
--- a/craftbukkit/src/main/java/vakiliner/chatcomponentapi/craftbukkit/BukkitParser.java
+++ b/craftbukkit/src/main/java/vakiliner/chatcomponentapi/craftbukkit/BukkitParser.java
@@ -1,6 +1,7 @@
 package vakiliner.chatcomponentapi.craftbukkit;
 
 import java.util.UUID;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
@@ -39,7 +40,11 @@ public void sendMessage(CommandSender sender, ChatComponent component, ChatMessa
 
 	public void execute(BukkitScheduler scheduler, IChatPlugin plugin, Runnable runnable) {
 		if (plugin instanceof Plugin) {
-			scheduler.runTask((Plugin) plugin, runnable);
+			if (!Bukkit.isPrimaryThread()) {
+				scheduler.runTask((Plugin) plugin, runnable);
+			} else {
+				runnable.run();
+			}
 		} else {
 			throw new IllegalArgumentException("Invalid plugin");
 		}