diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 8a076c3fc..e330ddaee 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -92,6 +92,8 @@ void MWWorld::ContainerStore::storeStates (const CellRefList<T>& collection,
     for (typename CellRefList<T>::List::const_iterator iter (collection.mList.begin());
         iter!=collection.mList.end(); ++iter)
     {
+        if (iter->mData.getCount() == 0)
+            continue;
         ESM::ObjectState state;
         storeState (*iter, state);
         int slot = equipable ? getSlot (*iter) : -1;
diff --git a/components/esm/inventorystate.cpp b/components/esm/inventorystate.cpp
index 1b0bc772e..2154faa83 100644
--- a/components/esm/inventorystate.cpp
+++ b/components/esm/inventorystate.cpp
@@ -37,6 +37,8 @@ void ESM::InventoryState::load (ESMReader &esm)
             LightState state;
             int slot;
             read (esm, state, slot);
+            if (state.mCount == 0)
+                continue;
             mLights.push_back (std::make_pair (state, slot));
         }
         else
@@ -44,6 +46,8 @@ void ESM::InventoryState::load (ESMReader &esm)
             ObjectState state;
             int slot;
             read (esm, state, slot);
+            if (state.mCount == 0)
+                continue;
             mItems.push_back (std::make_pair (state, std::make_pair (id, slot)));
         }
     }