diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm
index 65f8604fa26..348144e9a87 100644
--- a/code/modules/holodeck/computer.dm
+++ b/code/modules/holodeck/computer.dm
@@ -109,7 +109,7 @@
 			if(!ispath(program_to_load))
 				return FALSE
 			var/valid = FALSE
-			var/list/checked = program_cache
+			var/list/checked = typecacheof(program_cache)
 			if(obj_flags & EMAGGED)
 				checked |= emag_programs
 			for(var/prog in checked)
@@ -124,10 +124,11 @@
 			if(A)
 				load_program(A)
 		if("safety")
-			obj_flags ^= EMAGGED
-			if((obj_flags & EMAGGED) && program && emag_programs[program.name])
+			if((obj_flags & EMAGGED) && program)
 				emergency_shutdown()
 			nerf(obj_flags & EMAGGED)
+			obj_flags ^= EMAGGED
+			say("Safeties restored. Restarting...")
 
 /obj/machinery/computer/holodeck/process()
 	if(damaged && prob(10))
diff --git a/tgui/src/interfaces/holodeck.ract b/tgui/src/interfaces/holodeck.ract
index 94ea529e9ff..1eddb468a42 100644
--- a/tgui/src/interfaces/holodeck.ract
+++ b/tgui/src/interfaces/holodeck.ract
@@ -5,7 +5,7 @@
 		</ui-button>
 	{{/partial}}
 	{{#each data.default_programs}}
-	<ui-button action='load_program' params='{"type": {{type}}}' style='{{data.program == type ? "selected" : null}}'>
+		<ui-button action='load_program' params='{"type": {{type}}}' style='{{data.program == type ? "selected" : null}}'>
 				{{name}}
 	</ui-button><br>
 	{{/each}}