diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 81b59624d5..329bbbebee 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -193,9 +193,10 @@ doesn't have toxins access.
 
 /obj/machinery/computer/rdconsole/emag_act(mob/user)
 	if(!(obj_flags & EMAGGED))
-		to_chat(user, "<span class='notice'>You disable the security protocols</span>")
+		to_chat(user, "<span class='notice'>You disable the security protocols[locked? " and unlock the console.":""].</span>")
 		playsound(src, "sparks", 75, 1)
 		obj_flags |= EMAGGED
+		locked = FALSE
 	return ..()
 
 /obj/machinery/computer/rdconsole/proc/list_categories(list/categories, menu_num as num)
@@ -818,6 +819,9 @@ doesn't have toxins access.
 	if(ls["ui_mode"])
 		ui_mode = text2num(ls["ui_mode"])
 	if(ls["lock_console"])
+		if(obj_flags & EMAGGED)
+			to_chat(usr, "<span class='boldwarning'>Security protocol error: Unable to lock.</span>")
+			return
 		if(allowed(usr))
 			lock_console(usr)
 		else