diff --git a/CHANGELOG.md b/CHANGELOG.md
index 246db4f5..92cf8760 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
 * Fixed torchgod settings to include whether or not torchgod has been fought by the player before and respect `usingBiomeTorches` setting. (@Quinci135)
 * Fixed /worldmode not synchronising data to players after updating the world state (@bartico6, @Arthri)
 * Added `OnSendNetData` hook to TSAPI, which enables developers to intercept traffic being sent from the server to clients. (@Stealownz)
+* Moved the emoji player index check into a new class of handlers called `IllegalPerSe`, which is designed to help isolate parts of TShock and make it so that "protocol violations" are treated separately from heuristic based anti-cheat checks. (@hakusaro)
 
 ## TShock 4.5.3
 * Added permissions for using Teleportation Potions, Magic Conch, and Demon Conch. (@drunderscore)
diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs
index ed4c031a..5a6e6307 100644
--- a/TShockAPI/Bouncer.cs
+++ b/TShockAPI/Bouncer.cs
@@ -39,6 +39,7 @@ namespace TShockAPI
 		internal Handlers.SendTileRectHandler STSHandler { get; set; }
 		internal Handlers.NetModules.NetModulePacketHandler NetModuleHandler { get; set; }
 		internal Handlers.EmojiHandler EmojiHandler { get; set; }
+		internal Handlers.IllegalPerSe.EmojiPlayerMismatch EmojiPlayerMismatch { get; set; }
 		internal Handlers.DisplayDollItemSyncHandler DisplayDollItemSyncHandler { get; set; }
 		internal Handlers.RequestTileEntityInteractionHandler RequestTileEntityInteractionHandler { get; set; }
 		internal Handlers.LandGolfBallInCupHandler LandGolfBallInCupHandler { get; set; }
@@ -54,6 +55,9 @@ namespace TShockAPI
 			NetModuleHandler = new Handlers.NetModules.NetModulePacketHandler();
 			GetDataHandlers.ReadNetModule += NetModuleHandler.OnReceive;
 
+			EmojiPlayerMismatch = new Handlers.IllegalPerSe.EmojiPlayerMismatch();
+			GetDataHandlers.Emoji += EmojiPlayerMismatch.OnReceive;
+
 			EmojiHandler = new Handlers.EmojiHandler();
 			GetDataHandlers.Emoji += EmojiHandler.OnReceive;
 
diff --git a/TShockAPI/Handlers/EmojiHandler.cs b/TShockAPI/Handlers/EmojiHandler.cs
index f32993d1..ab0fb92e 100644
--- a/TShockAPI/Handlers/EmojiHandler.cs
+++ b/TShockAPI/Handlers/EmojiHandler.cs
@@ -3,24 +3,17 @@
 namespace TShockAPI.Handlers
 {
 	/// <summary>
-	/// Handles emoji packets and checks for validity and permissions
+	/// Handles emoji packets and checks for permissions
 	/// </summary>
 	public class EmojiHandler : IPacketHandler<EmojiEventArgs>
 	{
 		/// <summary>
-		/// Invoked when an emoji is sent in chat. Rejects the emoji packet if the player is spoofing IDs or does not have emoji permissions
+		/// Invoked when an emoji is sent in chat. Rejects the emoji packet if the player does not have emoji permissions
 		/// </summary>
 		/// <param name="sender"></param>
 		/// <param name="args"></param>
 		public void OnReceive(object sender, EmojiEventArgs args)
 		{
-			if (args.PlayerIndex != args.Player.Index)
-			{
-				TShock.Log.ConsoleError($"EmojiHandler: Emoji packet rejected for ID spoofing. Expected {args.Player.Index}, received {args.PlayerIndex} from {args.Player.Name}.");
-				args.Handled = true;
-				return;
-			}
-
 			if (!args.Player.HasPermission(Permissions.sendemoji))
 			{
 				args.Player.SendErrorMessage("You do not have permission to send emotes!");
diff --git a/TShockAPI/Handlers/IllegalPerSe/EmojiPlayerMismatch.cs b/TShockAPI/Handlers/IllegalPerSe/EmojiPlayerMismatch.cs
new file mode 100644
index 00000000..79fb6c9b
--- /dev/null
+++ b/TShockAPI/Handlers/IllegalPerSe/EmojiPlayerMismatch.cs
@@ -0,0 +1,25 @@
+using static TShockAPI.GetDataHandlers;
+
+namespace TShockAPI.Handlers.IllegalPerSe
+{
+	/// <summary>
+	/// Rejects emoji packets with mismatched identifiers
+	/// </summary>
+	public class EmojiPlayerMismatch : IPacketHandler<EmojiEventArgs>
+	{
+		/// <summary>
+		/// Invoked on emoji send. Rejects packets that are impossible.
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="args"></param>
+		public void OnReceive(object sender, EmojiEventArgs args)
+		{
+			if (args.PlayerIndex != args.Player.Index)
+			{
+				TShock.Log.ConsoleError($"IllegalPerSe: Emoji packet rejected for ID spoofing. Expected {args.Player.Index}, received {args.PlayerIndex} from {args.Player.Name}.");
+				args.Handled = true;
+				return;
+			}
+		}
+	}
+}
diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index add34f1e..59a7b9a4 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -106,6 +106,7 @@
     <Compile Include="Handlers\RequestTileEntityInteractionHandler.cs" />
     <Compile Include="Handlers\SendTileRectHandler.cs" />
     <Compile Include="Handlers\SyncTilePickingHandler.cs" />
+    <Compile Include="Handlers\IllegalPerSe\EmojiPlayerMismatch.cs" />
     <Compile Include="Hooks\AccountHooks.cs" />
     <Compile Include="Hooks\GeneralHooks.cs" />
     <Compile Include="Hooks\PlayerHooks.cs" />
@@ -239,4 +240,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>