diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index 46fa8c8181..f4c4ffaf99 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -37,6 +37,7 @@
 #include <EntityScriptingInterface.h> // TODO: consider moving to scriptengine.h
 
 #include "avatars/ScriptableAvatar.h"
+#include "entities/AssignmentParentFinder.h"
 #include "RecordingScriptingInterface.h"
 #include "AbstractAudioInterface.h"
 
@@ -62,6 +63,8 @@ Agent::Agent(ReceivedMessage& message) :
     connect(assetThread, &QThread::started, assetClient.data(), &AssetClient::init);
     assetThread->start();
 
+    DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
+
     DependencyManager::set<ResourceCacheSharedItems>();
     DependencyManager::set<SoundCache>();
     DependencyManager::set<AudioInjectorManager>();
@@ -284,6 +287,8 @@ void Agent::executeScript() {
 
     entityScriptingInterface->setEntityTree(_entityViewer.getTree());
 
+    DependencyManager::set<AssignmentParentFinder>(_entityViewer.getTree());
+
     // wire up our additional agent related processing to the update signal
     QObject::connect(_scriptEngine.get(), &ScriptEngine::update, this, &Agent::processAgentAvatarAndAudio);