diff --git a/apps/openmw/mwworld/cellstore.hpp b/apps/openmw/mwworld/cellstore.hpp
index d753c9745..36cc7f5eb 100644
--- a/apps/openmw/mwworld/cellstore.hpp
+++ b/apps/openmw/mwworld/cellstore.hpp
@@ -258,6 +258,9 @@ namespace MWWorld
                 if (mState != State_Loaded)
                     return false;
 
+                if (mMergedRefs.empty())
+                    return true;
+
                 mHasState = true;
 
                 for (unsigned int i=0; i<mMergedRefs.size(); ++i)
@@ -305,6 +308,9 @@ namespace MWWorld
                 if (mState != State_Loaded)
                     return false;
 
+                if (mMergedRefs.empty())
+                    return true;
+
                 mHasState = true;
 
                 CellRefList<T>& list = get<T>();