diff --git a/zone/client.cpp b/zone/client.cpp
index c10a26312..46f4da4c1 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -886,7 +886,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 	}
 	case 3: { /* Shout */
 		Mob *sender = this;
-		if (GetPet() && GetPet()->FindType(SE_VoiceGraft))
+		if (GetTarget() != this && GetPet() && GetPet()->FindType(SE_VoiceGraft))
 			sender = GetPet();
 
 		entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message);
@@ -924,7 +924,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 		else if(!RuleB(Chat, ServerWideAuction)) {
 			Mob *sender = this;
 
-			if (GetPet() && GetPet()->FindType(SE_VoiceGraft))
+			if (GetTarget() != this && GetPet() && GetPet()->FindType(SE_VoiceGraft))
 			sender = GetPet();
 
 		entity_list.ChannelMessage(sender, chan_num, language, message);
@@ -971,7 +971,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 		{
 			Mob *sender = this;
 
-			if (GetPet() && GetPet()->FindType(SE_VoiceGraft))
+			if (GetTarget() != this && GetPet() && GetPet()->FindType(SE_VoiceGraft))
 				sender = GetPet();
 
 			entity_list.ChannelMessage(sender, chan_num, language, message);
@@ -1069,7 +1069,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 #endif
 
 		Mob* sender = this;
-		if (GetPet() && GetPet()->FindType(SE_VoiceGraft))
+		if (GetTarget() != this && GetPet() && GetPet()->FindType(SE_VoiceGraft))
 			sender = GetPet();
 
 		entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message);