diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 75a5cbe261..17978101b6 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -810,8 +810,8 @@ public class PlayerConnection implements PacketPlayInListener {
                 }
             }
 
-            if (s.startsWith("/")) {
-                // CraftBukkit start
+            // CraftBukkit start
+            if (!packetplayinchat.a()) {
                 try {
                     this.minecraftServer.server.playerCommandState = true;
                     this.handleCommand(s);
@@ -828,7 +828,7 @@ public class PlayerConnection implements PacketPlayInListener {
                 chatmessage.getChatModifier().setColor(EnumChatFormat.RED);
                 this.sendPacket(new PacketPlayOutChat(chatmessage));
             } else if (true) {
-                this.chat(s, packetplayinchat.a());
+                this.chat(s, true);
                 // CraftBukkit end - the below is for reference. :)
             } else {
                 ChatMessage chatmessage1 = new ChatMessage("chat.type.text", new Object[] { this.player.getScoreboardDisplayName(), s});
@@ -871,7 +871,7 @@ public class PlayerConnection implements PacketPlayInListener {
             return;
         }
 
-        if (s.startsWith("/")) {
+        if (!async && s.startsWith("/")) {
             this.handleCommand(s);
         } else if (this.player.getChatFlags() == EnumChatVisibility.SYSTEM) {
             // Do nothing, this is coming from a plugin