diff --git a/src/MiNET/MiNET/ItemStackInventoryManager.cs b/src/MiNET/MiNET/ItemStackInventoryManager.cs
index 8ddafa068..b10b77693 100644
--- a/src/MiNET/MiNET/ItemStackInventoryManager.cs
+++ b/src/MiNET/MiNET/ItemStackInventoryManager.cs
@@ -188,7 +188,7 @@ protected virtual void ProcessDropAction(DropAction action, List<StackResponseCo
 				dropItem = (Item) sourceItem.Clone();
 				sourceItem.Count -= count;
 				dropItem.Count = count;
-				dropItem.UniqueId = Environment.TickCount;
+				dropItem.UniqueId = Environment.TickCount & Int32.MaxValue;
 			}
 
 			_player.DropItem(dropItem);
@@ -307,7 +307,7 @@ protected virtual void ProcessPlaceAction(PlaceAction action, List<StackResponse
 				destItem = (Item) sourceItem.Clone();
 				sourceItem.Count -= count;
 				destItem.Count = count;
-				destItem.UniqueId = Environment.TickCount;
+				destItem.UniqueId = Environment.TickCount & Int32.MaxValue;
 			}
 
 			Item existingItem = GetContainerItem(destination.ContainerId, destination.Slot);
@@ -380,7 +380,7 @@ protected virtual void ProcessTakeAction(TakeAction action, List<StackResponseCo
 				destItem = (Item) sourceItem.Clone();
 				sourceItem.Count -= count;
 				destItem.Count = count;
-				destItem.UniqueId = Environment.TickCount;
+				destItem.UniqueId = Environment.TickCount & Int32.MaxValue;
 			}
 
 			SetContainerItem(destination.ContainerId, destination.Slot, destItem);
@@ -430,7 +430,7 @@ protected virtual void ProcessCraftResultDeprecatedAction(CraftResultDeprecatedA
 			Item craftingResult = action.ResultItems.FirstOrDefault();
 			if (craftingResult == null) return;
 
-			craftingResult.UniqueId = Environment.TickCount;
+			craftingResult.UniqueId = Environment.TickCount & Int32.MaxValue;
 			SetContainerItem(59, 50, craftingResult);
 		}
 
@@ -449,7 +449,7 @@ protected virtual void ProcessCraftCreativeAction(CraftCreativeAction action)
 			if (creativeItem == null) throw new Exception($"Failed to find inventory item with unique id: {action.CreativeItemNetworkId}");
 			creativeItem = ItemFactory.GetItem(creativeItem.Id, creativeItem.Metadata);
 			creativeItem.Count = (byte) creativeItem.MaxStackSize;
-			creativeItem.UniqueId = Environment.TickCount;
+			creativeItem.UniqueId = Environment.TickCount & Int32.MaxValue;
 			Log.Debug($"Creating {creativeItem}");
 			_player.Inventory.UiInventory.Slots[50] = creativeItem;
 		}
diff --git a/src/MiNET/MiNET/Items/ArmorBase.cs b/src/MiNET/MiNET/Items/ArmorBase.cs
index 97a411139..fd6c7ac8f 100644
--- a/src/MiNET/MiNET/Items/ArmorBase.cs
+++ b/src/MiNET/MiNET/Items/ArmorBase.cs
@@ -40,7 +40,7 @@ public override void UseItem(Level world, Player player, BlockCoordinates blockC
 			byte slot = (byte) player.Inventory.Slots.IndexOf(this);
 			player.Inventory.SetInventorySlot(slot, player.Inventory.Helmet);
 
-			UniqueId = Environment.TickCount;
+			UniqueId = Environment.TickCount & Int32.MaxValue;
 			player.Inventory.Helmet = this;
 			player.SendArmorForPlayer();
 		}
@@ -57,7 +57,7 @@ public override void UseItem(Level world, Player player, BlockCoordinates blockC
 			byte slot = (byte) player.Inventory.Slots.IndexOf(this);
 			player.Inventory.SetInventorySlot(slot, player.Inventory.Chest);
 
-			UniqueId = Environment.TickCount;
+			UniqueId = Environment.TickCount & Int32.MaxValue;
 			player.Inventory.Chest = this;
 			player.SendArmorForPlayer();
 		}
@@ -74,7 +74,7 @@ public override void UseItem(Level world, Player player, BlockCoordinates blockC
 			byte slot = (byte) player.Inventory.Slots.IndexOf(this);
 			player.Inventory.SetInventorySlot(slot, player.Inventory.Leggings);
 
-			UniqueId = Environment.TickCount;
+			UniqueId = Environment.TickCount & Int32.MaxValue;
 			player.Inventory.Leggings = this;
 			player.SendArmorForPlayer();
 		}
@@ -91,7 +91,7 @@ public override void UseItem(Level world, Player player, BlockCoordinates blockC
 			byte slot = (byte) player.Inventory.Slots.IndexOf(this);
 			player.Inventory.SetInventorySlot(slot, player.Inventory.Boots);
 
-			UniqueId = Environment.TickCount;
+			UniqueId = Environment.TickCount & Int32.MaxValue;
 			player.Inventory.Boots = this;
 			player.SendArmorForPlayer();
 		}
diff --git a/src/MiNET/MiNET/Items/Item.cs b/src/MiNET/MiNET/Items/Item.cs
index ed15f01aa..23065ca67 100644
--- a/src/MiNET/MiNET/Items/Item.cs
+++ b/src/MiNET/MiNET/Items/Item.cs
@@ -48,7 +48,7 @@ public class Item : ICloneable
 	{
 		private static readonly ILog Log = LogManager.GetLogger(typeof(Item));
 
-		public int UniqueId { get; set; } = Environment.TickCount;
+		public int UniqueId { get; set; } = Environment.TickCount & Int32.MaxValue;
 		public string Name { get; protected set; } = string.Empty;
 		public short Id { get; protected set; }
 		public short Metadata { get; set; }
diff --git a/src/MiNET/MiNET/Items/ItemBow.cs b/src/MiNET/MiNET/Items/ItemBow.cs
index 0ec212b4b..725797755 100644
--- a/src/MiNET/MiNET/Items/ItemBow.cs
+++ b/src/MiNET/MiNET/Items/ItemBow.cs
@@ -94,7 +94,7 @@ public override void Release(Level world, Player player, BlockCoordinates blockC
 					if (!isInfinity)
 					{
 						item.Count -= 1;
-						item.UniqueId = Environment.TickCount;
+						item.UniqueId = Environment.TickCount & Int32.MaxValue;
 						if (item.Count <= 0) inventory.OffHand = new ItemAir();
 
 						player.SendPlayerInventory();
diff --git a/src/MiNET/MiNET/Items/ItemElytra.cs b/src/MiNET/MiNET/Items/ItemElytra.cs
index 49be39a1a..2c7b36486 100644
--- a/src/MiNET/MiNET/Items/ItemElytra.cs
+++ b/src/MiNET/MiNET/Items/ItemElytra.cs
@@ -41,7 +41,7 @@ public override void UseItem(Level world, Player player, BlockCoordinates blockC
 			byte slot = (byte) player.Inventory.Slots.IndexOf(this);
 			player.Inventory.SetInventorySlot(slot, player.Inventory.Chest);
 
-			UniqueId = Environment.TickCount;
+			UniqueId = Environment.TickCount & Int32.MaxValue;
 			player.Inventory.Chest = this;
 			player.SendArmorForPlayer();
 		}
diff --git a/src/MiNET/MiNET/Player.cs b/src/MiNET/MiNET/Player.cs
index 1fe258435..3e47a39c5 100644
--- a/src/MiNET/MiNET/Player.cs
+++ b/src/MiNET/MiNET/Player.cs
@@ -2560,7 +2560,7 @@ protected virtual void HandleTransactionRecords(List<TransactionRecord> records)
 							dropItem = (Item) sourceItem.Clone();
 							sourceItem.Count -= count;
 							dropItem.Count = count;
-							dropItem.UniqueId = Environment.TickCount;
+							dropItem.UniqueId = Environment.TickCount & Int32.MaxValue;
 						}
 
 						DropItem(dropItem);
diff --git a/src/MiNET/TestPlugin/CoreCommands.cs b/src/MiNET/TestPlugin/CoreCommands.cs
index 904837152..77414dec1 100644
--- a/src/MiNET/TestPlugin/CoreCommands.cs
+++ b/src/MiNET/TestPlugin/CoreCommands.cs
@@ -1270,7 +1270,7 @@ public void Kit(Player player, int kitId)
 			inventory.Slots[c++] = new ItemGoldenSword(); // Golden Sword
 			inventory.Slots[c++] = new ItemIronSword(); // Iron Sword
 			inventory.Slots[c++] = new ItemDiamondSword(); // Diamond Sword
-			inventory.Slots[c++] = new ItemArrow {Count = 64, UniqueId = Environment.TickCount}; // Arrows
+			inventory.Slots[c++] = new ItemArrow {Count = 64, UniqueId = Environment.TickCount & Int32.MaxValue}; // Arrows
 			inventory.Slots[c++] = new ItemEgg {Count = 64}; // Eggs
 			inventory.Slots[c++] = new ItemSnowball {Count = 64}; // Snowballs
 			inventory.Slots[c++] = new ItemIronSword
diff --git a/src/MiNET/TestPlugin/NiceLobby/NiceLobbyPlugin.cs b/src/MiNET/TestPlugin/NiceLobby/NiceLobbyPlugin.cs
index e80f2f624..146839c36 100644
--- a/src/MiNET/TestPlugin/NiceLobby/NiceLobbyPlugin.cs
+++ b/src/MiNET/TestPlugin/NiceLobby/NiceLobbyPlugin.cs
@@ -512,31 +512,31 @@ private void OnPlayerJoin(object o, PlayerEventArgs eventArgs)
 			{
 				Count = 1,
 				Metadata = 0,
-				UniqueId = Environment.TickCount
+				UniqueId = Environment.TickCount & Int32.MaxValue
 			};
 			player.Inventory.Slots[idx++] = new ItemIronSword()
 			{
 				Count = 1,
 				Metadata = 0,
-				UniqueId = Environment.TickCount
+				UniqueId = Environment.TickCount & Int32.MaxValue
 			};
 			player.Inventory.Slots[idx++] = new ItemIronSword()
 			{
 				Count = 1,
 				Metadata = 0,
-				UniqueId = Environment.TickCount
+				UniqueId = Environment.TickCount & Int32.MaxValue
 			};
 			player.Inventory.Slots[idx++] = new ItemIronSword()
 			{
 				Count = 1,
 				Metadata = 0,
-				UniqueId = Environment.TickCount
+				UniqueId = Environment.TickCount & Int32.MaxValue
 			};
 
-			player.Inventory.Helmet = new ItemDiamondHelmet() {UniqueId = Environment.TickCount};
-			player.Inventory.Chest = new ItemElytra() {UniqueId = Environment.TickCount};
-			player.Inventory.Leggings = new ItemDiamondLeggings() {UniqueId = Environment.TickCount};
-			player.Inventory.Boots = new ItemDiamondBoots() {UniqueId = Environment.TickCount};
+			player.Inventory.Helmet = new ItemDiamondHelmet() {UniqueId = Environment.TickCount & Int32.MaxValue};
+			player.Inventory.Chest = new ItemElytra() {UniqueId = Environment.TickCount & Int32.MaxValue};
+			player.Inventory.Leggings = new ItemDiamondLeggings() {UniqueId = Environment.TickCount & Int32.MaxValue};
+			player.Inventory.Boots = new ItemDiamondBoots() {UniqueId = Environment.TickCount & Int32.MaxValue};
 			//while (player.Inventory.SetFirstEmptySlot(new ItemIronAxe(), false)) { }
 
 			player.SendPlayerInventory();