diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp
index 40cc602bf..a3e3573f1 100644
--- a/src/game/ItemHandler.cpp
+++ b/src/game/ItemHandler.cpp
@@ -740,7 +740,10 @@ void WorldSession::SendListInventory(uint64 vendorguid)
 
     if (!vItems)
     {
-        _player->SendSellError(SELL_ERR_CANT_FIND_VENDOR, NULL, 0, 0);
+        WorldPacket data( SMSG_LIST_INVENTORY, (8+1+1) );
+        data << uint64(vendorguid);
+        data << uint8(0);                                   // count==0, next will be error code
+        data << uint8(0);                                   // "Vendor has no inventory"
         return;
     }
 
@@ -795,11 +798,15 @@ void WorldSession::SendListInventory(uint64 vendorguid)
         }
     }
 
-    if ( count == 0 || data.size() != 8 + 1 + size_t(count) * 8 * 4 )
+    if (count == 0)
+    {
+        data << uint8(0);                                   // "Vendor has no inventory"
+        SendPacket(&data);
         return;
+    }
 
     data.put<uint8>(count_pos, count);
-    SendPacket( &data );
+    SendPacket(&data);
 }
 
 void WorldSession::HandleAutoStoreBagItemOpcode( WorldPacket & recv_data )
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index ced4220c1..d3fe047f0 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10224"
+ #define REVISION_NR "10225"
 #endif // __REVISION_NR_H__