diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp
index 48d45bbb55..70d6033e3e 100644
--- a/assignment-client/src/octree/OctreeSendThread.cpp
+++ b/assignment-client/src/octree/OctreeSendThread.cpp
@@ -48,13 +48,14 @@ OctreeSendThread::~OctreeSendThread() {
                                             "- ending sending thread [" << this << "]";
 
     OctreeServer::clientDisconnected();
+    OctreeServer::stopTrackingThread(this);
+
     _node.clear();
     _myAssignment.clear();
 }
 
 void OctreeSendThread::setIsShuttingDown() {
     _isShuttingDown = true;
-    OctreeServer::stopTrackingThread(this);
 }