diff --git a/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryItemsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryItemsEvent.java
index f5047b72..7fa6a66b 100644
--- a/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryItemsEvent.java
+++ b/src/main/java/com/eu/habbo/messages/incoming/inventory/RequestInventoryItemsEvent.java
@@ -17,6 +17,12 @@ public class RequestInventoryItemsEvent extends MessageHandler {
     @Override
     public void handle() throws Exception {
         int totalItems = this.client.getHabbo().getInventory().getItemsComponent().getItems().size();
+
+        if (totalItems == 0) {
+                this.client.sendResponse(new InventoryItemsComposer(0, 1, new TIntObjectHashMap<>()));
+                return;
+            }
+            
         int totalFragments = (int) Math.ceil((double) totalItems / 1000.0);
 
         if (totalFragments == 0) {
@@ -25,6 +31,7 @@ public class RequestInventoryItemsEvent extends MessageHandler {
 
         synchronized (this.client.getHabbo().getInventory().getItemsComponent().getItems()) {
             TIntObjectMap<HabboItem> items = new TIntObjectHashMap<>();
+
             TIntObjectIterator<HabboItem> iterator = this.client.getHabbo().getInventory().getItemsComponent().getItems().iterator();
 
             int count = 0;