diff --git a/code/__DEFINES/power.dm b/code/__DEFINES/power.dm
index 361d9c9a5ac..804647b2eaf 100644
--- a/code/__DEFINES/power.dm
+++ b/code/__DEFINES/power.dm
@@ -1,3 +1,4 @@
+#define CABLE_LAYER_ALL (~0)
 #define CABLE_LAYER_1 (1<<0)
 	#define CABLE_LAYER_1_NAME "Red Power Line"
 #define CABLE_LAYER_2 (1<<1)
diff --git a/code/modules/power/apc/apc_attack.dm b/code/modules/power/apc/apc_attack.dm
index af922d84b91..e0d7218e617 100644
--- a/code/modules/power/apc/apc_attack.dm
+++ b/code/modules/power/apc/apc_attack.dm
@@ -61,7 +61,7 @@
 			balloon_alert(user, "need ten lengths of cable!")
 			return
 
-		var/terminal_cable_layer
+		var/terminal_cable_layer = cable_layer // Default to machine's cable layer
 		if(LAZYACCESS(params2list(params), RIGHT_CLICK))
 			var/choice = tgui_input_list(user, "Select Power Input Cable Layer", "Select Cable Layer", GLOB.cable_name_to_layer)
 			if(isnull(choice))
@@ -79,7 +79,7 @@
 		if(terminal || !opened || !has_electronics)
 			return
 		var/turf/our_turf = get_turf(src)
-		var/obj/structure/cable/cable_node = our_turf.get_cable_node()
+		var/obj/structure/cable/cable_node = our_turf.get_cable_node(terminal_cable_layer)
 		if(prob(50) && electrocute_mob(usr, cable_node, cable_node, 1, TRUE))
 			do_sparks(5, TRUE, src)
 			return
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index db046db979c..54ff044d883 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -459,7 +459,7 @@
 ///////////////////////////////////////////////
 
 // return a cable able connect to machinery on layer if there's one on the turf, null if there isn't one
-/turf/proc/get_cable_node(cable_layer = CABLE_LAYER_1)
+/turf/proc/get_cable_node(cable_layer = CABLE_LAYER_ALL)
 	if(!can_have_cabling())
 		return null
 	for(var/obj/structure/cable/C in src)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index f6a8ddfe99c..5521a151556 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -147,7 +147,7 @@
 		if(do_after(user, 20, target = src))
 			if(C.get_amount() < 10 || !C)
 				return
-			var/obj/structure/cable/N = T.get_cable_node() //get the connecting node cable, if there's one
+			var/obj/structure/cable/N = T.get_cable_node(terminal_cable_layer) //get the connecting node cable, if there's one
 			if (prob(50) && electrocute_mob(usr, N, N, 1, TRUE)) //animate the electrocution if uncautious and unlucky
 				do_sparks(5, TRUE, src)
 				return