diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 20646e6da..f69f606b4 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -192,11 +192,14 @@ namespace MWWorld
             if (it != mStatic.end() && Misc::StringUtils::ciEqual(it->second.mId, id)) {
                 // delete from the static part of mShared
                 typename std::vector<T *>::iterator sharedIter = mShared.begin();
-                for (; sharedIter != (mShared.begin()+mStatic.size()); ++sharedIter) {
+                typename std::vector<T *>::iterator end = sharedIter + mStatic.size();
+
+                while (sharedIter != mShared.end() && sharedIter != end) { 
                     if((*sharedIter)->mId == item.mId) {
                         mShared.erase(sharedIter);
                         break;
                     }
+                    ++sharedIter;
                 }
                 mStatic.erase(it);
             }