diff --git a/addons/sourcemod/scripting/saxtonhale.sp b/addons/sourcemod/scripting/saxtonhale.sp
index b0b11056..364d5f59 100644
--- a/addons/sourcemod/scripting/saxtonhale.sp
+++ b/addons/sourcemod/scripting/saxtonhale.sp
@@ -203,6 +203,20 @@ enum
 	CHANNEL_MAX = 6,
 };
 
+enum
+{
+	OBS_MODE_NONE = 0,	// not in spectator mode
+	OBS_MODE_DEATHCAM,	// special mode for death cam animation
+	OBS_MODE_FREEZECAM,	// zooms to a target, and freeze-frames on them
+	OBS_MODE_FIXED,		// view from a fixed camera position
+	OBS_MODE_IN_EYE,	// follow a player in first person view
+	OBS_MODE_CHASE,		// follow a player in third person view
+	OBS_MODE_POI,		// PASSTIME point of interest - game objective, big fight, anything interesting; added in the middle of the enum due to tons of hard-coded "<ROAMING" enum compares
+	OBS_MODE_ROAMING,	// free roaming
+
+	NUM_OBSERVER_MODES,
+};
+
 char g_strPreferencesName[][] = {
 	"Boss Selection",
 	"",
diff --git a/addons/sourcemod/scripting/vsh/base_boss.sp b/addons/sourcemod/scripting/vsh/base_boss.sp
index 65631d7c..3e404dcb 100644
--- a/addons/sourcemod/scripting/vsh/base_boss.sp
+++ b/addons/sourcemod/scripting/vsh/base_boss.sp
@@ -436,12 +436,19 @@ Action AttachEnt_SetTransmit(int iAttachEnt, int iClient)
 	if (iOwner == INVALID_ENT_REFERENCE)
 		return Plugin_Stop;
 	
+	if (iOwner != iClient)
+	{
+		if (GetEntPropEnt(iClient, Prop_Send, "m_hObserverTarget") == iOwner && GetEntProp(iClient, Prop_Send, "m_iObserverMode") == OBS_MODE_IN_EYE)
+		    return Plugin_Stop;
+	}
+	else if (TF2_IsPlayerInCondition(iOwner, TFCond_Taunting))
+	{
+		return Plugin_Continue;
+	}
+
 	if (TF2_IsPlayerInCondition(iOwner, TFCond_Cloaked) || TF2_IsPlayerInCondition(iOwner, TFCond_Disguised) || TF2_IsPlayerInCondition(iOwner, TFCond_Stealthed))
 		return Plugin_Stop;
 	
-	if (iOwner != iClient || TF2_IsPlayerInCondition(iOwner, TFCond_Taunting))
-		return Plugin_Continue;
-	
 	return Plugin_Stop;
 }