diff --git a/code/_globalvars/lists/quirks.dm b/code/_globalvars/lists/quirks.dm
index f436bdf9d9f..9a0804184d1 100644
--- a/code/_globalvars/lists/quirks.dm
+++ b/code/_globalvars/lists/quirks.dm
@@ -47,7 +47,7 @@ GLOBAL_LIST_INIT(possible_junkie_addictions, setup_junkie_addictions(list(
 )))
 
 ///Options for the Smoker quirk to choose from
-GLOBAL_LIST_INIT(possible_smoker_addictions, setup_junkie_addictions(list(
+GLOBAL_LIST_INIT(possible_smoker_addictions, setup_smoker_addictions(list(
 	/obj/item/storage/fancy/cigarettes,
 	/obj/item/storage/fancy/cigarettes/cigpack_midori,
 	/obj/item/storage/fancy/cigarettes/cigpack_uplift,
diff --git a/code/modules/client/preferences/addict.dm b/code/modules/client/preferences/addict.dm
index 3c63b5ea867..8d70a6ccbfa 100644
--- a/code/modules/client/preferences/addict.dm
+++ b/code/modules/client/preferences/addict.dm
@@ -4,6 +4,12 @@
 		. -= addiction
 		.[addiction::name] = addiction
 
+/proc/setup_smoker_addictions(list/possible_addictions)
+	. = possible_addictions
+	for(var/obj/item/storage/addiction as anything in .)
+		. -= addiction
+		.[format_text(addiction::name)] = addiction // Format text to remove \improper used in cigarette packs
+
 /datum/preference/choiced/junkie
 	category = PREFERENCE_CATEGORY_MANUALLY_RENDERED
 	savefile_key = "junkie"