diff --git a/src/zr/event.inc b/src/zr/event.inc
index 9f0f23c..0089c87 100644
--- a/src/zr/event.inc
+++ b/src/zr/event.inc
@@ -155,7 +155,7 @@ public Action:EventPlayerTeam(Handle:event, const String:name[], bool:dontBroadc
     ImmunityOnClientTeam(index);
 
     // Fire post joinclass command. (Bots dont joinclass, so we fire it from here instead.)
-    if (IsFakeClient(index))
+    if (IsFakeClient(index) && !IsClientSourceTV(index))
         CreateTimer(0.1, CommandPlayerClassPost, index);
 
     return Plugin_Handled;
diff --git a/src/zr/zspawn.inc b/src/zr/zspawn.inc
index ea04f60..4f1082f 100644
--- a/src/zr/zspawn.inc
+++ b/src/zr/zspawn.inc
@@ -124,7 +124,7 @@ ZSpawnOnClientClassPost(client)
 {
     // Is auto zspawn enabled and is the client death?
     new bool:autozspawn = GetConVarBool(g_hCvarsList[CVAR_ZSPAWN_AUTO]);
-    if (autozspawn && !IsPlayerAlive(client))
+    if (autozspawn && !IsPlayerAlive(client) && !IsClientSourceTV(client))
     {
         // Get our zspawn condition.
         new ZSpawnCondition:condition = GetZSpawnCondition();