diff --git a/src/ui/controls/target.cpp b/src/ui/controls/target.cpp
index 22b95eb4..544b7559 100644
--- a/src/ui/controls/target.cpp
+++ b/src/ui/controls/target.cpp
@@ -200,6 +200,8 @@ CObject* CTarget::DetectFriendObject(Math::Point pos)
             target = obj;
         }
 
+        if (!target->Implements(ObjectInterfaceType::Old)) continue; // TODO: To be removed after COldObjectInterface is gone
+
         for (int j=0 ; j<OBJECTMAXPART ; j++ )
         {
             int rank = obj->GetObjectRank(j);