diff --git a/assignment-client/src/octree/OctreeSendThread.cpp b/assignment-client/src/octree/OctreeSendThread.cpp
index 4105b21eb8..6ee7904c55 100644
--- a/assignment-client/src/octree/OctreeSendThread.cpp
+++ b/assignment-client/src/octree/OctreeSendThread.cpp
@@ -21,6 +21,7 @@ quint64 endSceneSleepTime = 0;
 
 OctreeSendThread::OctreeSendThread(OctreeServer* myServer, SharedNodePointer node) :
     _myServer(myServer),
+    _node(node),
     _nodeUUID(node->getUUID()),
     _packetData(),
     _nodeMissingCount(0),
@@ -45,6 +46,7 @@ OctreeSendThread::~OctreeSendThread() {
     qDebug() << qPrintable(safeServerName)  << "server [" << _myServer << "]: client disconnected "
                                             "- ending sending thread [" << this << "]";
     OctreeServer::clientDisconnected();
+    _node.clear();
 }
 
 void OctreeSendThread::setIsShuttingDown() {
@@ -74,28 +76,14 @@ bool OctreeSendThread::process() {
 
     // don't do any send processing until the initial load of the octree is complete...
     if (_myServer->isInitialLoadComplete()) {
-        SharedNodePointer node = NodeList::getInstance()->nodeWithUUID(_nodeUUID, false);
-        if (node) {
+        if (!_node.isNull()) {
             _nodeMissingCount = 0;
-            OctreeQueryNode* nodeData = static_cast<OctreeQueryNode*>(node->getLinkedData());
+            OctreeQueryNode* nodeData = static_cast<OctreeQueryNode*>(_node->getLinkedData());
 
             // Sometimes the node data has not yet been linked, in which case we can't really do anything
             if (nodeData && !nodeData->isShuttingDown()) {
                 bool viewFrustumChanged = nodeData->updateCurrentViewFrustum();
-                packetDistributor(node, nodeData, viewFrustumChanged);
-            }
-        } else {
-            _nodeMissingCount++;
-            const int MANY_FAILED_LOCKS = 1;
-            if (_nodeMissingCount >= MANY_FAILED_LOCKS) {
-
-                QString safeServerName("Octree");
-                if (_myServer) {
-                    safeServerName = _myServer->getMyServerName();
-                }
-                
-                qDebug() << qPrintable(safeServerName)  << "server: sending thread [" << this << "]"
-                        << "failed to get nodeWithUUID() " << _nodeUUID <<". Failed:" << _nodeMissingCount << "times";
+                packetDistributor(_node, nodeData, viewFrustumChanged);
             }
         }
     }
diff --git a/assignment-client/src/octree/OctreeSendThread.h b/assignment-client/src/octree/OctreeSendThread.h
index 4b1b6d8c92..ef968707f9 100644
--- a/assignment-client/src/octree/OctreeSendThread.h
+++ b/assignment-client/src/octree/OctreeSendThread.h
@@ -39,6 +39,7 @@ protected:
 
 private:
     OctreeServer* _myServer;
+    SharedNodePointer _node;
     QUuid _nodeUUID;
 
     int handlePacketSend(const SharedNodePointer& node, OctreeQueryNode* nodeData, int& trueBytesSent, int& truePacketsSent);