diff --git a/src/object/client/CGUnit_C.cpp b/src/object/client/CGUnit_C.cpp
index 4b2320a..11f32d2 100644
--- a/src/object/client/CGUnit_C.cpp
+++ b/src/object/client/CGUnit_C.cpp
@@ -1,5 +1,7 @@
 #include "object/client/CGUnit_C.hpp"
+#include "object/client/ObjMgr.hpp"
 #include "db/Db.hpp"
+#include "ui/Game.hpp"
 
 WOWGUID CGUnit_C::s_activeMover;
 
@@ -99,6 +101,16 @@ CGUnit_C::~CGUnit_C() {
     // TODO
 }
 
+int32_t CGUnit_C::CanHighlight() {
+    if (this->m_unit->flags & 0x2000000) {
+        if (this->m_unit->createdBy != ClntObjMgrGetActivePlayer() || this->GetGUID() != CGPetInfo::GetPet(0)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
 int32_t CGUnit_C::CanBeTargetted() {
     return this->CanHighlight();
 }
diff --git a/src/object/client/CGUnit_C.hpp b/src/object/client/CGUnit_C.hpp
index a22e889..b3103ff 100644
--- a/src/object/client/CGUnit_C.hpp
+++ b/src/object/client/CGUnit_C.hpp
@@ -22,6 +22,7 @@ class CGUnit_C : public CGObject_C, public CGUnit {
         // Virtual public member functions
         virtual ~CGUnit_C();
         // TODO
+        virtual int32_t CanHighlight();
         virtual int32_t CanBeTargetted();
         // TODO