diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm
index a09c13951a3..01461fee85c 100644
--- a/code/game/objects/items/devices/modkit.dm
+++ b/code/game/objects/items/devices/modkit.dm
@@ -116,7 +116,7 @@
 			return
 
 		playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1)
-		var/obj/item/P = new voidsuit_product(W.loc)
+		var/obj/item/P = new voidsuit_product(get_turf(W))
 
 		if(!reconverting)
 			to_chat(user, SPAN_NOTICE("Your permit for a [P] has been processed. Enjoy!"))
diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
index 76ae7d28a3d..31611569302 100644
--- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
+++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
@@ -426,7 +426,7 @@
 	new /obj/item/ammo_magazine/plasma(src)
 	new /obj/item/ammo_magazine/plasma(src)
 
-/obj/structure/closet/crate/secure/gear_loadout/ninja/hacker/fill()
+/obj/structure/closet/crate/secure/gear_loadout/ninja/hacker
 	associated_hardsuit = /obj/item/rig/light/hacker/ninja
 
 /obj/structure/closet/crate/secure/gear_loadout/ninja/hacker/fill()
diff --git a/html/changelogs/alberyk-fixhardsuitandstuff.yml b/html/changelogs/alberyk-fixhardsuitandstuff.yml
new file mode 100644
index 00000000000..ae51b5603dd
--- /dev/null
+++ b/html/changelogs/alberyk-fixhardsuitandstuff.yml
@@ -0,0 +1,7 @@
+author: Alberyk
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed the cybersuit choice in the ninja hardsuit token not working properly."
+  - bugfix: "Fixed voidsuit modkits deleting voidsuits pieces."