diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
index 92257bfee..d77a2b868 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
@@ -25,6 +25,8 @@ import nautilus.game.arcade.stats.DeathsStatTracker;
 import nautilus.game.arcade.stats.KillsStatTracker;
 import nautilus.game.arcade.stats.LoseStatTracker;
 import nautilus.game.arcade.stats.StatTracker;
+import nautilus.game.arcade.stats.TeamDeathsStatTracker;
+import nautilus.game.arcade.stats.TeamKillsStatTracker;
 import nautilus.game.arcade.stats.WinStatTracker;
 import nautilus.game.arcade.world.WorldData;
 
@@ -250,7 +252,9 @@ public abstract class Game implements Listener
 				new WinStatTracker(this),
 				new LoseStatTracker(this),
 				new DamageDealtStatTracker(this),
-				new DamageTakenStatTracker(this)
+				new DamageTakenStatTracker(this),
+				new TeamDeathsStatTracker(this),
+				new TeamKillsStatTracker(this)
 		);
 
 		System.out.println("Loading " + GetName() + "...");
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/TeamGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/TeamGame.java
index 94739b377..111f450b4 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/TeamGame.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/TeamGame.java
@@ -8,8 +8,8 @@ import nautilus.game.arcade.*;
 import nautilus.game.arcade.events.*;
 import nautilus.game.arcade.game.GameTeam.*;
 import nautilus.game.arcade.kit.*;
-import nautilus.game.arcade.stats.TeamGameDeathsStatTracker;
-import nautilus.game.arcade.stats.TeamGameKillsStatTracker;
+import nautilus.game.arcade.stats.TeamDeathsStatTracker;
+import nautilus.game.arcade.stats.TeamKillsStatTracker;
 
 import org.bukkit.entity.*;
 import org.bukkit.event.*;
@@ -30,11 +30,6 @@ public abstract class TeamGame extends Game
 	public TeamGame(ArcadeManager manager, GameType gameType, Kit[] kits, String[] gameDesc)
 	{
 		super(manager, gameType, kits, gameDesc);
-
-		registerStatTrackers(
-				new TeamGameDeathsStatTracker(this),
-				new TeamGameKillsStatTracker(this)
-		);
 	}
 
 	@EventHandler
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamGameDeathsStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamDeathsStatTracker.java
similarity index 85%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamGameDeathsStatTracker.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamDeathsStatTracker.java
index 634853ca7..2d787c8f5 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamGameDeathsStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamDeathsStatTracker.java
@@ -8,11 +8,10 @@ import mineplex.core.common.util.UtilPlayer;
 import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
 import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.GameTeam;
-import nautilus.game.arcade.game.TeamGame;
 
-public class TeamGameDeathsStatTracker extends StatTracker<TeamGame>
+public class TeamDeathsStatTracker extends StatTracker<Game>
 {
-	public TeamGameDeathsStatTracker(TeamGame game)
+	public TeamDeathsStatTracker(Game game)
 	{
 		super(game);
 	}
@@ -23,6 +22,9 @@ public class TeamGameDeathsStatTracker extends StatTracker<TeamGame>
 		if (getGame().GetState() != Game.GameState.Live)
 			return;
 
+		if (getGame().GetTeamList().size() < 2)
+			return;
+
 		if (event.GetLog().GetPlayer() == null)
 			return;
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamGameKillsStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamKillsStatTracker.java
similarity index 85%
rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamGameKillsStatTracker.java
rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamKillsStatTracker.java
index 00dee397f..f723246f6 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamGameKillsStatTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/TeamKillsStatTracker.java
@@ -8,11 +8,10 @@ import mineplex.core.common.util.UtilPlayer;
 import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
 import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.GameTeam;
-import nautilus.game.arcade.game.TeamGame;
 
-public class TeamGameKillsStatTracker extends StatTracker<TeamGame>
+public class TeamKillsStatTracker extends StatTracker<Game>
 {
-	public TeamGameKillsStatTracker(TeamGame game)
+	public TeamKillsStatTracker(Game game)
 	{
 		super(game);
 	}
@@ -23,6 +22,9 @@ public class TeamGameKillsStatTracker extends StatTracker<TeamGame>
 		if (getGame().GetState() != Game.GameState.Live)
 			return;
 
+		if (getGame().GetTeamList().size() < 2)
+			return;
+
 		if (event.GetLog().GetKiller() == null)
 			return;