diff --git a/src/world/Manager/InventoryMgr.cpp b/src/world/Manager/InventoryMgr.cpp
index 7a17defa..0b61c37e 100644
--- a/src/world/Manager/InventoryMgr.cpp
+++ b/src/world/Manager/InventoryMgr.cpp
@@ -19,11 +19,14 @@ void Sapphire::World::Manager::InventoryMgr::sendInventoryContainer( Sapphire::E
 {
   auto sequence = player.getNextInventorySequence();
   auto pMap = container->getItemMap();
+  uint32_t itemCount = 0;
 
   for( auto itM = pMap.begin(); itM != pMap.end(); ++itM )
   {
     if( !itM->second )
-      return;
+      continue;
+
+    itemCount++;
 
     if( container->getId() == Common::InventoryType::Currency || container->getId() == Common::InventoryType::Crystal )
     {
@@ -57,7 +60,7 @@ void Sapphire::World::Manager::InventoryMgr::sendInventoryContainer( Sapphire::E
 
   auto containerInfoPacket = makeZonePacket< Server::FFXIVIpcContainerInfo >( player.getId() );
   containerInfoPacket->data().containerSequence = sequence;
-  containerInfoPacket->data().numItems = container->getEntryCount();
+  containerInfoPacket->data().numItems = itemCount;
   containerInfoPacket->data().containerId = container->getId();
 
   player.queuePacket( containerInfoPacket );