diff --git a/apps/openmw/mwmp/LocalActor.cpp b/apps/openmw/mwmp/LocalActor.cpp
index 2212ed8ea..3c9103255 100644
--- a/apps/openmw/mwmp/LocalActor.cpp
+++ b/apps/openmw/mwmp/LocalActor.cpp
@@ -201,11 +201,16 @@ void LocalActor::updateEquipment(bool forceUpdate, bool sendImmediately)
     if (!ptr.getClass().hasInventoryStore(ptr))
         return;
 
+    MWWorld::InventoryStore &invStore = ptr.getClass().getInventoryStore(ptr);
+    
+    // If we've never sent any data, autoEquip the actor just in case its inventory
+    // slots have been cleared by a previous Container packet
+    if (!hasSentData)
+        invStore.autoEquip(ptr);
+
     if (forceUpdate)
         equipmentChanged = true;
 
-    MWWorld::InventoryStore &invStore = ptr.getClass().getInventoryStore(ptr);
-
     for (int slot = 0; slot < MWWorld::InventoryStore::Slots; slot++)
     {
         auto &item = equipmentItems[slot];