diff --git a/code/game/gamemodes/calamity/calamity.dm b/code/game/gamemodes/calamity/calamity.dm
index 4f7b9ab49d..3104e624e3 100644
--- a/code/game/gamemodes/calamity/calamity.dm
+++ b/code/game/gamemodes/calamity/calamity.dm
@@ -12,14 +12,15 @@
 
 /datum/game_mode/calamity/create_antagonists()
 
-	shuffle(all_antag_types) // This is probably the only instance in the game where the order will be important.
-	var/i = 1
+	//Let's not modify global lists for trivial reasons, even if it seems harmless right now.
+	var/list/antag_candidates = all_antag_types.Copy()
+	
 	var/grab_antags = round(num_players()/ANTAG_TYPE_RATIO)+1
-	for(var/antag_id in all_antag_types)
-		if(i > grab_antags)
-			break
+	while(antag_candidates.len && antag_tags.len < grab_antags)
+		var/antag_id = pick(antag_candidates)
+		antag_candidates -= antag_id
 		antag_tags |= antag_id
-		i++
+	
 	..()
 
 /datum/game_mode/calamity/check_victory()
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index b8a99badf1..08a8289060 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -572,6 +572,7 @@ var/global/list/additional_antag_types = list()
 			if(antag)
 				antag_templates |= antag
 
+	shuffle(antag_templates) //In the case of multiple antag types
 	newscaster_announcements = pick(newscaster_standard_feeds)
 
 /datum/game_mode/proc/check_victory()