diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index a860a8cd3f..6f7eeb95c3 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -242,6 +242,8 @@
 		SSpersistence.station_was_destroyed = TRUE
 	if(!mode.allow_persistence_save)
 		SSpersistence.station_persistence_save_disabled = TRUE
+	else
+		SSpersistence.SaveTCGCards()
 	SSpersistence.CollectData()
 
 	//stop collecting feedback during grifftime
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index 0ba6076be2..c090d7367c 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -496,9 +496,15 @@ SUBSYSTEM_DEF(job)
 			H.equip_to_slot_if_possible(binder, SLOT_IN_BACKPACK, disable_warning = TRUE, bypass_equip_delay_self = TRUE)
 			for(var/card_type in H.client.prefs.tcg_cards)
 				if(card_type)
-					var/obj/item/tcg_card/card = new(get_turf(H), card_type, H.client.prefs.tcg_cards[card_type])
-					card.forceMove(binder)
-					binder.cards.Add(card)
+					if(islist(H.client.prefs.tcg_cards[card_type]))
+						for(var/duplicate in H.client.prefs.tcg_cards[card_type])
+							var/obj/item/tcg_card/card = new(get_turf(H), card_type, duplicate)
+							card.forceMove(binder)
+							binder.cards.Add(card)
+					else
+						var/obj/item/tcg_card/card = new(get_turf(H), card_type, H.client.prefs.tcg_cards[card_type])
+						card.forceMove(binder)
+						binder.cards.Add(card)
 			binder.check_for_exodia()
 			if(length(H.client.prefs.tcg_decks))
 				binder.decks = H.client.prefs.tcg_decks
@@ -508,9 +514,15 @@ SUBSYSTEM_DEF(job)
 			H.equip_to_slot_if_possible(binder, SLOT_IN_BACKPACK, disable_warning = TRUE, bypass_equip_delay_self = TRUE)
 			for(var/card_type in N.client.prefs.tcg_cards)
 				if(card_type)
-					var/obj/item/tcg_card/card = new(get_turf(H), card_type, N.client.prefs.tcg_cards[card_type])
-					card.forceMove(binder)
-					binder.cards.Add(card)
+					if(islist(H.client.prefs.tcg_cards[card_type]))
+						for(var/duplicate in N.client.prefs.tcg_cards[card_type])
+							var/obj/item/tcg_card/card = new(get_turf(H), card_type, duplicate)
+							card.forceMove(binder)
+							binder.cards.Add(card)
+					else
+						var/obj/item/tcg_card/card = new(get_turf(H), card_type, N.client.prefs.tcg_cards[card_type])
+						card.forceMove(binder)
+						binder.cards.Add(card)
 			binder.check_for_exodia()
 			if(length(N.client.prefs.tcg_decks))
 				binder.decks = N.client.prefs.tcg_decks
diff --git a/code/controllers/subsystem/persistence/_persistence.dm b/code/controllers/subsystem/persistence/_persistence.dm
index 9b2c019db4..d494561d0f 100644
--- a/code/controllers/subsystem/persistence/_persistence.dm
+++ b/code/controllers/subsystem/persistence/_persistence.dm
@@ -88,7 +88,6 @@ SUBSYSTEM_DEF(persistence)
 	SavePhotoPersistence()						//THIS IS PERSISTENCE, NOT THE LOGGING PORTION.
 	SavePaintings()
 	SaveScars()
-	SaveTCGCards()
 
 /**
  * Loads persistent data relevant to the current map: Objects, etc.
diff --git a/code/modules/tcg/cards.dm b/code/modules/tcg/cards.dm
index 54d6d5abd9..f5c7c47aaf 100644
--- a/code/modules/tcg/cards.dm
+++ b/code/modules/tcg/cards.dm
@@ -381,6 +381,14 @@
 	. = ..()
 	LoadComponent(/datum/component/storage/concrete/tcg)
 
+/obj/item/tcgcard_deck/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage/concrete/tcg)
+	STR.storage_flags = STORAGE_FLAGS_LEGACY_DEFAULT
+	STR.max_volume = DEFAULT_VOLUME_TINY * 30
+	STR.max_w_class = DEFAULT_VOLUME_TINY
+	STR.max_items = 30
+
 /obj/item/tcgcard_deck/update_icon_state()
 	. = ..()
 	if(flipped)
@@ -797,7 +805,13 @@
 	var/list/card_types = list()
 	for(var/obj/item/tcg_card/card in binder.cards)
 		//if(!card.illegal) //Uncomment if you want to block syndie cards from saving
-		card_types[card.datum_type] = card.illegal
+		if(!(card.datum_type in card_types))
+			card_types[card.datum_type] = card.illegal
+		else
+			if(islist(card_types[card.datum_type]))
+				card_types[card.datum_type] += card.illegal
+			else
+				card_types[card.datum_type] = list(card_types[card.datum_type], card.illegal)
 
 	client.prefs.tcg_decks = binder.decks
 	client.prefs.tcg_cards = card_types