diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 4438782ae5..d9109703cb 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -233,8 +233,8 @@ void Agent::setIsAvatar(bool isAvatar) {
         }
         
         if (_avatarBillboardTimer) {
-            _avatarIdentityTimer->stop();
-            delete _avatarIdentityTimer;
+            _avatarBillboardTimer->stop();
+            delete _avatarBillboardTimer;
             _avatarBillboardTimer = nullptr;
         }
     }