diff --git a/addons/sourcemod/scripting/include/shavit.inc b/addons/sourcemod/scripting/include/shavit.inc
index 6b3378e0..c99e4905 100644
--- a/addons/sourcemod/scripting/include/shavit.inc
+++ b/addons/sourcemod/scripting/include/shavit.inc
@@ -593,7 +593,7 @@ stock int GetSpectatorTarget(int client, int fallback = -1)
 	{
 		int iObserverMode = GetEntProp(client, Prop_Send, "m_iObserverMode");
 
-		if(iObserverMode >= 3 && iObserverMode <= 5)
+		if (iObserverMode >= 3 && iObserverMode <= 7)
 		{
 			int iTarget = GetEntPropEnt(client, Prop_Send, "m_hObserverTarget");
 
diff --git a/addons/sourcemod/scripting/shavit-sounds.sp b/addons/sourcemod/scripting/shavit-sounds.sp
index 4fcddbb0..cc2110f7 100644
--- a/addons/sourcemod/scripting/shavit-sounds.sp
+++ b/addons/sourcemod/scripting/shavit-sounds.sp
@@ -282,17 +282,7 @@ void PlayEventSound(int client, bool everyone, char sound[PLATFORM_MAX_PATH])
 			continue;
 		}
 
-		if(everyone)
-		{
-			clients[count++] = i;
-
-			continue;
-		}
-
-		int iObserverMode = GetEntProp(client, Prop_Send, "m_iObserverMode");
-
-		// add player and their spectators
-		if(i == client || (IsClientObserver(i) && (iObserverMode >= 3 || iObserverMode <= 5) && GetEntPropEnt(i, Prop_Send, "m_hObserverTarget") == client))
+		if (everyone || i == client || GetSpectatorTarget(i) == client)
 		{
 			clients[count++] = i;
 		}