diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index e482f7df4..8a9f49299 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -2137,6 +2137,10 @@ Creature* Player::GetNPCIfCanInteractWith(ObjectGuid guid, uint32 npcflagmask)
     if (guid.IsEmpty() || !IsInWorld() || isInFlight())
         return NULL;
 
+    // not in interactive state
+    if (hasUnitState(UNIT_STAT_CAN_NOT_REACT))
+        return NULL;
+
     // exist (we need look pets also for some interaction (quest/etc)
     Creature *unit = GetMap()->GetCreatureOrPetOrVehicle(guid);
     if (!unit)
@@ -2187,6 +2191,10 @@ GameObject* Player::GetGameObjectIfCanInteractWith(ObjectGuid guid, uint32 gameo
     if (guid.IsEmpty() || !IsInWorld() || isInFlight())
         return NULL;
 
+    // not in interactive state
+    if (hasUnitState(UNIT_STAT_CAN_NOT_REACT))
+        return NULL;
+
     if (GameObject *go = GetMap()->GetGameObject(guid))
     {
         if (uint32(go->GetGoType()) == gameobject_type || gameobject_type == MAX_GAMEOBJECT_TYPE)
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index e7e3b4366..ed80a2e73 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9796"
+ #define REVISION_NR "9797"
 #endif // __REVISION_NR_H__