diff --git a/direct/src/distributed/DistributedObjectAI.py b/direct/src/distributed/DistributedObjectAI.py
index 4dd1094fe8..ffdb948c1a 100644
--- a/direct/src/distributed/DistributedObjectAI.py
+++ b/direct/src/distributed/DistributedObjectAI.py
@@ -356,7 +356,8 @@ 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:
+            self.air.storeObjectLocation(self.doId, self.parentId, self.zoneId)
 
     if wantOtpServer:
         def generateInit(self, repository=None):