diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5ad085e9b..67245dc1ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -107,6 +107,7 @@
     Bug #6606: Quests with multiple IDs cannot always be restarted
     Bug #6655: Constant effect absorb attribute causes the game to break
     Bug #6670: Dialogue order is incorrect
+    Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer
     Feature #890: OpenMW-CS: Column filtering
     Feature #1465: "Reset" argument for AI functions
     Feature #2491: Ability to make OpenMW "portable"
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index e208d7191e..7e3433bd92 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -164,7 +164,7 @@ void Objects::removeCell(const MWWorld::CellStore* store)
 
 void Objects::updatePtr(const MWWorld::Ptr &old, const MWWorld::Ptr &cur)
 {
-    osg::Node* objectNode = cur.getRefData().getBaseNode();
+    osg::ref_ptr<osg::Node> objectNode = cur.getRefData().getBaseNode();
     if (!objectNode)
         return;