diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index f821fdc3..a2a3a386 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -533,12 +533,15 @@ namespace TShockAPI
 
             args.TPlayer.hostile = pvp;
 
-            if (pvp == true && TShock.Config.AlwaysPvP)
-                args.Player.IgnoreActionsForPvP = false;
-            else
+            if (TShock.Config.AlwaysPvP)
             {
-                args.Player.Spawn();
-                args.Player.IgnoreActionsForPvP = true;
+                if (pvp == true)
+                    args.Player.IgnoreActionsForPvP = false;
+                else
+                {
+                    args.Player.Spawn();
+                    args.Player.IgnoreActionsForPvP = true;
+                }
             }
 
             NetMessage.SendData((int)PacketTypes.TogglePvp, -1, -1, "", args.Player.Index);