diff --git a/Classic/prefs/serverPrefs.cs b/Classic/prefs/serverPrefs.cs
index 3bf3632..039b854 100644
--- a/Classic/prefs/serverPrefs.cs
+++ b/Classic/prefs/serverPrefs.cs
@@ -101,6 +101,7 @@ $Host::holoName6 = "Harbinger";
 $Host::Info = "This is a Tribes 2 Classic server. More information in Discord. <a:playt2.com/discord>playt2.com/discord</a>";
 $Host::ItemRespawnTime = 30;
 $Host::KickBanTime = 600;
+$Host::KickObserverStartOnJoin = 1;
 $Host::KickObserverTimeout = 1200;
 $Host::LakRabbitDuelMode = 0;
 $Host::LakRabbitNoSplashDamage = 1;
diff --git a/Classic/scripts/defaultGame.cs b/Classic/scripts/defaultGame.cs
index 15c83c7..897cbb6 100644
--- a/Classic/scripts/defaultGame.cs
+++ b/Classic/scripts/defaultGame.cs
@@ -1824,7 +1824,7 @@ function DefaultGame::clientMissionDropReady(%game, %client)
    for(%i = 1; %i <= 13; %i++)
       $stats::weapon_damage[%client, %i] = "";
 
-   if(%client.team $=0) //Observer only
+   if(%client.team $=0 && $Host::KickObserverStartOnJoin) //Observer only
    {
       if(!%client.isAdmin && !$Host::TournamentMode && $Host::KickObserverTimeout)
       {