diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm
index 30230a38fe2..3dac9f21488 100644
--- a/code/game/gamemodes/events/space_ninja.dm
+++ b/code/game/gamemodes/events/space_ninja.dm
@@ -533,7 +533,6 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 
 	equip_to_slot_or_del(new /obj/item/clothing/mask/gas/voice/space_ninja(src), slot_wear_mask)
 	equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_belt)
-	equip_to_slot_or_del(new /obj/item/weapon/tank/oxygen(src), slot_s_store)
 
 	var/obj/item/weapon/rig/light/ninja/ninjasuit = new(src)
 
@@ -546,6 +545,16 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 		ninjasuit.req_access = list()
 
 	equip_to_slot_or_del(ninjasuit,slot_back)
+
+	if(istype(wear_suit,/obj/item/weapon/rig))
+		var/obj/item/weapon/rig/rig = wear_suit
+		if(rig.air_supply)
+			internal = rig.air_supply
+	if(!internal && s_store)
+		internal = s_store
+	if(internal)
+		internals.icon_state = "internal1"
+
 	spawn(10)
 		ninjasuit.toggle_seals(src,1)
 
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 9461b9477c4..721becf039f 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -460,8 +460,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			call(/datum/game_mode/proc/equip_syndicate)(new_character)
 		if("Ninja")
 			new_character.equip_space_ninja()
-			new_character.internal = new_character.s_store
-			new_character.internals.icon_state = "internal1"
 			if(ninjastart.len == 0)
 				new_character << "<B>\red A proper starting location for you could not be found, please report this bug!</B>"
 				new_character << "<B>\red Attempting to place at a carpspawn.</B>"