diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm
index d257abc199..878af570e8 100644
--- a/code/modules/mining/drilling/drill.dm
+++ b/code/modules/mining/drilling/drill.dm
@@ -54,9 +54,9 @@
 
 /obj/machinery/mining/drill/Initialize()
 	. = ..()
-	default_apply_parts()
 	if(ispath(cell))
 		cell = new cell(src)
+	default_apply_parts()
 
 /obj/machinery/mining/drill/loaded
 	cell = /obj/item/weapon/cell/high
@@ -241,7 +241,7 @@
 			capacity = 200 * P.rating
 		if(istype(P, /obj/item/weapon/stock_parts/capacitor))
 			charge_use -= 10 * P.rating
-	cell = locate(/obj/item/weapon/cell) in component_parts
+	cell = locate(/obj/item/weapon/cell) in src
 
 /obj/machinery/mining/drill/proc/check_supports()