diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 807f2299b2..9befa06363 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -308,8 +308,14 @@ namespace MWClass
 
     void Container::writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const
     {
+        if (!ptr.getRefData().getCustomData())
+        {
+            state.mHasCustomState = false;
+            return;
+        }
+
         const ContainerCustomData& customData = ptr.getRefData().getCustomData()->asContainerCustomData();
-        if (!ptr.getRefData().getCustomData() || !customData.mStore.isResolved())
+        if (!customData.mStore.isResolved())
         {
             state.mHasCustomState = false;
             return;