diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index efd1bede47..402245d0c3 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -254,10 +254,7 @@ void AvatarManager::clearAllAvatars() {
 
     QWriteLocker locker(&_hashLock);
 
-    _myAvatar->die();
-    _myAvatar.reset();
-
-    _avatarHash.clear();
+    handleRemovedAvatar(_myAvatar);
 }
 
 void AvatarManager::setLocalLights(const QVector<AvatarManager::LocalLight>& localLights) {