diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm
index e8054369d88..62f545e6ee3 100644
--- a/code/datums/diseases/_disease.dm
+++ b/code/datums/diseases/_disease.dm
@@ -77,8 +77,8 @@
 	SSdisease.active_diseases += D //Add it to the active diseases list, now that it's actually in a mob and being processed.
 
 	D.after_add()
+	D.register_disease_signals()
 	infectee.med_hud_set_status()
-	register_disease_signals()
 
 	var/turf/source_turf = get_turf(infectee)
 	log_virus("[key_name(infectee)] was infected by virus: [src.admin_details()] at [loc_name(source_turf)]")
diff --git a/code/datums/quirks/negative_quirks/chronic_illness.dm b/code/datums/quirks/negative_quirks/chronic_illness.dm
index 49438160c48..a96c787e37d 100644
--- a/code/datums/quirks/negative_quirks/chronic_illness.dm
+++ b/code/datums/quirks/negative_quirks/chronic_illness.dm
@@ -10,8 +10,8 @@
 	mail_goodies = list(/obj/item/storage/pill_bottle/sansufentanyl)
 
 /datum/quirk/item_quirk/chronic_illness/add(client/client_source)
-	var/datum/disease/chronic_illness/hms = new /datum/disease/chronic_illness()
-	quirk_holder.ForceContractDisease(hms)
+	var/datum/disease/chronic_illness/hms = new()
+	quirk_holder.ForceContractDisease(hms, make_copy = FALSE, del_on_fail = TRUE)
 
 /datum/quirk/item_quirk/chronic_illness/add_unique(client/client_source)
 	give_item_to_holder(/obj/item/storage/pill_bottle/sansufentanyl, list(LOCATION_BACKPACK), flavour_text = "You've been provided with medication to help manage your condition. Take it regularly to avoid complications.", notify_player = TRUE)