diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
index 787b08661..0ef5f1c01 100644
--- a/src/game/PetHandler.cpp
+++ b/src/game/PetHandler.cpp
@@ -99,7 +99,10 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
                         return;
 
                     // not let attack friendly units.
-                    if( GetPlayer()->IsFriendlyTo(TargetUnit))
+                    if(GetPlayer()->IsFriendlyTo(TargetUnit))
+                        return;
+                    // Not let attack through obstructions
+                    if(!pet->IsWithinLOSInMap(TargetUnit))
                         return;
 
                     if(pet->getVictim())
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index c2dd4a599..2ca2e69e8 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 "6853"
+ #define REVISION_NR "6854"
 #endif // __REVISION_NR_H__