diff --git a/direct/src/controls/ControlManager.py b/direct/src/controls/ControlManager.py
index 3a7f887c7f..d9120f84f5 100755
--- a/direct/src/controls/ControlManager.py
+++ b/direct/src/controls/ControlManager.py
@@ -113,6 +113,7 @@ class ControlManager:
                 if self.currentControls is not None:
                     self.currentControls.disableAvatarControls()
                     self.currentControls.setCollisionsActive(0)
+                    self.currentControls.setAvatar(None)
                 self.currentControls = controls
                 self.currentControls.setAvatar(avatar)
                 self.currentControls.setCollisionsActive(1)