diff --git a/code/game/machinery/ai_resource.dm b/code/game/machinery/ai_resource.dm
index 8b4211bc37f..3d33d78ca85 100644
--- a/code/game/machinery/ai_resource.dm
+++ b/code/game/machinery/ai_resource.dm
@@ -157,7 +157,9 @@ GLOBAL_LIST_EMPTY(ai_nodes)
 	if(!resource_key)
 		return
 	for(var/mob/living/silicon/ai/new_ai as anything in GLOB.ai_list)
-		if(new_ai.stat || new_ai.in_storage)
+		if(new_ai.stat || new_ai.in_storage || new_ai.shunted)
+			continue
+		if(istype(new_ai.loc, /obj/machinery/power/apc))
 			continue
 		if(!assigned_ai) // Not found
 			assigned_ai = new_ai // Assign to the first AI in the list to start
@@ -309,6 +311,10 @@ GLOBAL_LIST_EMPTY(ai_nodes)
 	data["ai_list"] = list()
 	data["nodes_list"] = list()
 	for(var/mob/living/silicon/ai/A in GLOB.ai_list)
+		if(istype(A.loc, /obj/machinery/power/apc)) // AIs in APCs as malf should be hidden
+			continue
+		if(A.shunted)
+			continue
 		var/list/ai_data = list(
 			"name" = A.name,
 			"uid" = A.UID(),
@@ -352,7 +358,14 @@ GLOBAL_LIST_EMPTY(ai_nodes)
 		if("reassign")
 			if(!length(GLOB.ai_list))
 				return FALSE
-			var/new_ai = tgui_input_list(usr, "Pick a new AI", "AI Selector", GLOB.ai_list)
+			var/list/ais = list()
+			for(var/mob/living/silicon/ai/new_ai as anything in GLOB.ai_list)
+				if(new_ai.stat || new_ai.in_storage || new_ai.shunted)
+					continue
+				if(istype(new_ai.loc, /obj/machinery/power/apc))
+					continue
+				ais += new_ai
+			var/new_ai = tgui_input_list(usr, "Pick a new AI", "AI Selector", ais)
 			if(!new_ai)
 				return FALSE
 			var/obj/machinery/ai_node/selected_node = locateUID(params["uid"])
diff --git a/code/modules/mob/living/silicon/ai/ai_programs.dm b/code/modules/mob/living/silicon/ai/ai_programs.dm
index 705da22629d..81bb6fb952e 100644
--- a/code/modules/mob/living/silicon/ai/ai_programs.dm
+++ b/code/modules/mob/living/silicon/ai/ai_programs.dm
@@ -245,6 +245,9 @@
 
 /datum/spell/ai_spell/choose_program/cast(list/targets, mob/living/silicon/ai/user)
 	. = ..()
+	if(istype(user.loc, /obj/machinery/power/apc))
+		to_chat(user, "<span class='warning'>Error: APCs do not have enough processing power to handle programs!</span>")
+		return
 	user.program_picker.ui_interact(user)
 
 /// RGB Lighting - Recolors Lights