diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm
index e717f8c1bf..398bfdeb07 100644
--- a/code/controllers/subsystem/persistence.dm
+++ b/code/controllers/subsystem/persistence.dm
@@ -13,7 +13,7 @@ SUBSYSTEM_DEF(persistence)
 	var/list/saved_messages = list()
 	var/list/saved_modes = list(1,2,3)
 	var/list/saved_dynamic_rules = list(list(),list(),list())
-	var/list/saved_storytellers = list("foo","bar","baz")
+	var/list/saved_storytellers = list("foo","bar","baz","foo again")
 	var/list/saved_maps
 	var/list/saved_trophies = list()
 	var/list/spawned_objects = list()
@@ -410,6 +410,7 @@ SUBSYSTEM_DEF(persistence)
 	WRITE_FILE(json_file, json_encode(file_data))
 
 /datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode)
+	saved_storytellers[4] = saved_storytellers[3]
 	saved_storytellers[3] = saved_storytellers[2]
 	saved_storytellers[2] = saved_storytellers[1]
 	saved_storytellers[1] = mode.storyteller.name
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index f43ff4f3a4..ded7842876 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -377,8 +377,13 @@ SUBSYSTEM_DEF(vote)
 			if("dynamic")
 				for(var/T in config.storyteller_cache)
 					var/datum/dynamic_storyteller/S = T
-					choices.Add(initial(S.name))
-					choice_descs.Add(initial(S.desc))
+					var/recent_rounds = 0
+					for(var/i in SSpersistence.saved_storytellers.len)
+						if(SSpersistence.saved_storytellers[i] == initial(S.name))
+							recent_rounds++
+					if(recent_rounds<initial(S.weight))
+						choices.Add(initial(S.name))
+						choice_descs.Add(initial(S.desc))
 				choices.Add("Secret")
 				choice_descs.Add("Standard secret. Switches mode if it wins.")
 			if("custom")