diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 47db78b5e4..4438782ae5 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -364,6 +364,7 @@ void Agent::processAgentAvatarAndAudio(float deltaTime) {
 }
 
 void Agent::aboutToFinish() {
+    setIsAvatar(false);// will stop timers for sending billboards and identity packets
     if (_scriptEngine) {
         _scriptEngine->stop();
     }