diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cb2fd5b..6eb544ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
   * If there is no section called "Upcoming changes" below this line, please add one with `## Upcoming changes` as the first line, and then a bulleted item directly after with the first change.
 
 ## Upcoming changes
+* Fixed `TSPlayer.GiveItem` not working if the player is in lava. (@gohjoseph)
 
 ## TShock 4.5.17
 * Fixed duplicate characters (twins) after repeatedly logging in as the same character due to connection not being immediately closed during `NetHooks_NameCollision`. (@gohjoseph)
diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index 7b452fe4..93db08bc 100644
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -1380,7 +1380,9 @@ namespace TShockAPI
 		public virtual void GiveItem(int type, int stack, int prefix = 0)
 		{
 			int itemIndex = Item.NewItem(new EntitySource_DebugCommand(), (int)X, (int)Y, TPlayer.width, TPlayer.height, type, stack, true, prefix, true);
-			SendData(PacketTypes.ItemDrop, "", itemIndex);
+			Main.item[itemIndex].playerIndexTheItemIsReservedFor = this.Index;
+			SendData(PacketTypes.ItemDrop, "", itemIndex, 1);
+			SendData(PacketTypes.ItemOwner, null, itemIndex);
 		}
 
 		/// <summary>