diff --git a/FFXIVClassic Map Server/actors/chara/player/Inventory.cs b/FFXIVClassic Map Server/actors/chara/player/Inventory.cs
index 5618b733..6770643f 100644
--- a/FFXIVClassic Map Server/actors/chara/player/Inventory.cs	
+++ b/FFXIVClassic Map Server/actors/chara/player/Inventory.cs	
@@ -593,7 +593,8 @@ namespace FFXIVClassic_Map_Server.actors.chara.player
                 }
             }
 
-            endOfListIndex = lastNullSlot;
+            if (lastNullSlot != -1)
+                endOfListIndex = lastNullSlot;
         }
 
         #endregion