diff --git a/assignment-client/src/entities/AssignmentParentFinder.cpp b/assignment-client/src/entities/AssignmentParentFinder.cpp
index cc5c7557dc..294556383e 100644
--- a/assignment-client/src/entities/AssignmentParentFinder.cpp
+++ b/assignment-client/src/entities/AssignmentParentFinder.cpp
@@ -13,6 +13,12 @@
 
 SpatiallyNestableWeakPointer AssignmentParentFinder::find(QUuid parentID, bool& success) const {
     SpatiallyNestableWeakPointer parent;
+
+    if (parentID.isNull()) {
+        success = true;
+        return parent;
+    }
+
     // search entities
     parent = _tree->findEntityByEntityItemID(parentID);
     if (parent.expired()) {