diff --git a/direct/src/distributed/DistributedObject.py b/direct/src/distributed/DistributedObject.py
index 8fea089b2d..bee7188727 100644
--- a/direct/src/distributed/DistributedObject.py
+++ b/direct/src/distributed/DistributedObject.py
@@ -193,6 +193,8 @@ class DistributedObject(PandaObject):
         """
         assert self.notify.debugStateCall(self)
         self.activeState = ESGenerating
+        # this has already been set at this point
+        #self.cr.storeObjectLocation(self.doId, self.parentId, self.zoneId)
 
     def generateInit(self):
         """
diff --git a/direct/src/distributed/DistributedObjectAI.py b/direct/src/distributed/DistributedObjectAI.py
index b3842b296c..9dd2862e7b 100644
--- a/direct/src/distributed/DistributedObjectAI.py
+++ b/direct/src/distributed/DistributedObjectAI.py
@@ -355,6 +355,7 @@ class DistributedObjectAI(DirectObject.DirectObject):
         other networked info in this function.
         """
         assert self.notify.debugStateCall(self)
+        self.air.storeObjectLocation(self.doId, self.parentId, self.zoneId)
 
     if wantOtpServer:
         def generateInit(self, repository=None):