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 7290ee636..78950be64 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
@@ -1796,7 +1796,7 @@ public abstract class Game extends ListenerComponent implements Lifetimed
 		Manager.GetGameCreationManager().setNextGameType(gameType);
 
 		// End Current
-		if (InProgress())
+		if (inLobby())
 		{
 			SetState(GameState.Dead);
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/HubClockManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/HubClockManager.java
index 0ff2e98c9..105d2ff6c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/HubClockManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/HubClockManager.java
@@ -21,9 +21,7 @@ import mineplex.core.recharge.Recharge;
 import nautilus.game.arcade.ArcadeManager;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.events.PlayerStateChangeEvent;
-import nautilus.game.arcade.game.Game.GameState;
 import nautilus.game.arcade.game.GameTeam.PlayerState;
-import nautilus.game.arcade.managers.voting.event.VoteStartEvent;
 
 public class HubClockManager implements Listener
 {
@@ -40,7 +38,6 @@ public class HubClockManager implements Listener
 	{
 		_manager = manager;
 
-		UtilServer.getPlayersCollection().forEach(this::giveClock);
 		manager.registerEvents(this);
 	}
 
@@ -76,12 +73,6 @@ public class HubClockManager implements Listener
 		giveClockToAll();
 	}
 
-	@EventHandler
-	public void giveOnVote(VoteStartEvent event)
-	{
-		giveClockToAll();
-	}
-
 	@EventHandler
 	public void giveOnDeath(PlayerStateChangeEvent event)
 	{
@@ -141,6 +132,6 @@ public class HubClockManager implements Listener
 
 	private boolean canGiveClock()
 	{
-		return _manager.GetGame() == null || _manager.GetGame().inLobby() || _manager.GetGame().GiveClock;
+		return _manager.GetGame() == null || _manager.GetGame().inLobby() && _manager.GetGame().GiveClock;
 	}
 }