diff --git a/direct/src/distributed/ClientRepositoryBase.py b/direct/src/distributed/ClientRepositoryBase.py
index 069a2c48aa..0e3b2a2807 100644
--- a/direct/src/distributed/ClientRepositoryBase.py
+++ b/direct/src/distributed/ClientRepositoryBase.py
@@ -12,7 +12,12 @@ from direct.distributed.CRDataCache import CRDataCache
 from direct.distributed.ConnectionRepository import ConnectionRepository
 from direct.showbase.PythonUtil import safeRepr, itype, makeList
 from direct.showbase.MessengerGlobal import messenger
-from .MsgTypes import CLIENT_ENTER_OBJECT_REQUIRED_OTHER, MsgId2Names
+from .MsgTypes import MsgId2Names
+if ConfigVariableBool('astron-support', True):
+    from .MsgTypes import CLIENT_ENTER_OBJECT_REQUIRED_OTHER
+else:
+    from .MsgTypes import CLIENT_CREATE_OBJECT_REQUIRED_OTHER
+
 from . import CRCache
 from . import ParentMgr
 from . import RelatedObjectMgr
diff --git a/direct/src/distributed/DoInterestManager.py b/direct/src/distributed/DoInterestManager.py
index d3abcb253f..aea77b332c 100755
--- a/direct/src/distributed/DoInterestManager.py
+++ b/direct/src/distributed/DoInterestManager.py
@@ -8,7 +8,10 @@ p.s. A great deal of this code is just code moved from ClientRepository.py.
 """
 
 from panda3d.core import ConfigVariableBool
-from .MsgTypes import CLIENT_ADD_INTEREST, CLIENT_ADD_INTEREST_MULTIPLE, CLIENT_REMOVE_INTEREST
+from .MsgTypes import CLIENT_ADD_INTEREST, CLIENT_REMOVE_INTEREST
+if ConfigVariableBool('astron-support', True):
+    from .MsgTypes import CLIENT_ADD_INTEREST_MULTIPLE
+
 from direct.showbase import DirectObject
 from direct.showbase.MessengerGlobal import messenger
 from .PyDatagram import PyDatagram
diff --git a/direct/src/distributed/PyDatagram.py b/direct/src/distributed/PyDatagram.py
index 37b8c77c7d..7632347817 100755
--- a/direct/src/distributed/PyDatagram.py
+++ b/direct/src/distributed/PyDatagram.py
@@ -27,7 +27,8 @@ from panda3d.direct import (
 )
 # Import the type numbers
 
-from direct.distributed.MsgTypes import CONTROL_CHANNEL
+if ConfigVariableBool('astron-support', True):
+    from direct.distributed.MsgTypes import CONTROL_CHANNEL
 
 
 class PyDatagram(Datagram):