diff --git a/code/modules/xenobio2/machinery/injector.dm b/code/modules/xenobio2/machinery/injector.dm
index a3f88825c53..7b482d5c1d6 100644
--- a/code/modules/xenobio2/machinery/injector.dm
+++ b/code/modules/xenobio2/machinery/injector.dm
@@ -67,19 +67,20 @@
 		src.occupant = victim
 
 /obj/machinery/xenobio2/manualinjector/proc/eject_contents()
-	for(var/obj/thing in (contents - component_parts - circuit - beaker))
-		thing.forceMove(loc)
+	eject_xeno()
+	eject_beaker()
+	return
+
+/obj/machinery/xenobio2/manualinjector/proc/eject_xeno()
 	if(occupant)
 		occupant.forceMove(loc)
 		occupant = null
-	return
-
+	
 /obj/machinery/xenobio2/manualinjector/proc/eject_beaker()
 	if(beaker)
 		var/obj/item/weapon/reagent_containers/glass/beaker/B = beaker
 		B.loc = loc
 		beaker = null
-	return
 
 /obj/machinery/xenobio2/manualinjector/proc/inject_reagents()
 	if(!occupant)
diff --git a/code/modules/xenobio2/machinery/injector_computer.dm b/code/modules/xenobio2/machinery/injector_computer.dm
index f65599e4850..7bcccd55ca8 100644
--- a/code/modules/xenobio2/machinery/injector_computer.dm
+++ b/code/modules/xenobio2/machinery/injector_computer.dm
@@ -99,7 +99,7 @@
 			injector.inject_reagents()
 			active = 0
 	if(href_list["eject_occupant"])
-		injector.eject_contents()
+		injector.eject_xeno()
 
 	if(href_list["eject_beaker"])
 		injector.eject_beaker()