diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index a3106259a0a..f1752d30df9 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -45,8 +45,11 @@ var/global/datum/controller/gameticker/ticker
 			current_state = GAME_STATE_PREGAME
 			world << "<B>Unable to choose playable game mode.</B> Reverting to pre-game lobby."
 			return 0
-		ResetOccupations()//Ok this is not the best, but should work as a quickfix
+		ResetOccupations()
 		src.mode = pickweight(runnable_modes)
+		if(src.mode)
+			var/mtype = src.mode.type
+			src.mode = new mtype
 	else
 		src.mode = config.pick_mode(master_mode)