diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index 33cd48a047..aa1847f64b 100755
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -542,15 +542,11 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar
         auto scene = qApp->getMain3DScene();
         avatar->fadeOut(scene, removalReason);
 
-        std::weak_ptr<AvatarData> avatarDataWeakPtr = removedAvatar;
-        transaction.transitionFinishedOperator(avatar->getRenderItemID(), [avatarDataWeakPtr]() {
-            auto avatarDataPtr = avatarDataWeakPtr.lock();
-
-            if (avatarDataPtr) {
-                auto avatar = std::static_pointer_cast<Avatar>(avatarDataPtr);
-                avatar->setIsFading(false);
-            }
+        transaction.transitionFinishedOperator(avatar->getRenderItemID(), [avatar]() {
+            avatar->setIsFading(false);
         });
+
+        scene->enqueueTransaction(transaction);
     }
 
     _avatarsToFadeOut.push_back(removedAvatar);
diff --git a/interface/src/avatar/OtherAvatar.cpp b/interface/src/avatar/OtherAvatar.cpp
index 22ddea14c6..11eb6542c4 100755
--- a/interface/src/avatar/OtherAvatar.cpp
+++ b/interface/src/avatar/OtherAvatar.cpp
@@ -50,7 +50,6 @@ OtherAvatar::OtherAvatar(QThread* thread) : Avatar(thread) {
 }
 
 OtherAvatar::~OtherAvatar() {
-    qDebug() << "-------->";
     removeOrb();
 }
 
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index ee701020b5..26407c3564 100755
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -132,7 +132,6 @@ AvatarData::AvatarData() :
 }
 
 AvatarData::~AvatarData() {
-    qDebug() << "AvatarData::~AvatarData()";
     delete _headData;
 }
 
diff --git a/libraries/render/src/render/Scene.cpp b/libraries/render/src/render/Scene.cpp
index d3bcfb1f95..0cbb7e1214 100644
--- a/libraries/render/src/render/Scene.cpp
+++ b/libraries/render/src/render/Scene.cpp
@@ -408,7 +408,7 @@ void Scene::transitionItems(const Transaction::TransitionAdds& transactions) {
             // Only remove if:
             // transitioning to something other than none or we're transitioning to none from ELEMENT_LEAVE_DOMAIN or USER_LEAVE_DOMAIN
             const auto& oldTransitionType = transitionStage->getTransition(transitionId).eventType;
-            if (transitionType != Transition::NONE || !(oldTransitionType == Transition::ELEMENT_LEAVE_DOMAIN || oldTransitionType == Transition::USER_LEAVE_DOMAIN)) {
+            if (transitionType == Transition::NONE && oldTransitionType != Transition::NONE) {
                 resetItemTransition(itemId);
             }
         }