diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm
index b6dc4c4402f..666af13e88d 100644
--- a/code/modules/clothing/spacesuits/rig/modules/modules.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm
@@ -182,7 +182,7 @@
 		to_chat(user, SPAN_WARNING("The suit cannot function while the wearer is prone."))
 		return FALSE
 
-	if(holder.security_check_enabled && !holder.check_suit_access(user))
+	if(holder.security_check_enabled && holder.locked && !holder.check_suit_access(user))
 		to_chat(user, SPAN_DANGER("Access denied."))
 		return FALSE
 
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index da00ea3c0f3..f154b5c1aba 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -569,7 +569,7 @@
 
 /obj/item/rig/proc/check_suit_access(var/mob/living/carbon/human/user)
 
-	if(!security_check_enabled)
+	if(!security_check_enabled || !locked)
 		return 1
 
 	if(istype(user))
diff --git a/code/modules/clothing/spacesuits/rig/rig_attackby.dm b/code/modules/clothing/spacesuits/rig/rig_attackby.dm
index 42734e5bee2..d10cd1621d8 100644
--- a/code/modules/clothing/spacesuits/rig/rig_attackby.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_attackby.dm
@@ -22,7 +22,7 @@
 			to_chat(user, "<span class='danger'>\The [src] doesn't seem to have a locking mechanism.</span>")
 			return
 
-		if(security_check_enabled && !src.allowed(user))
+		if(security_check_enabled && locked && !src.allowed(user))
 			to_chat(user, "<span class='danger'>Access denied.</span>")
 			return
 
@@ -229,4 +229,4 @@
 		if(MODULE_SPECIAL)
 			return "special"
 		if(MODULE_VAURCA)
-			return "vaurca"
\ No newline at end of file
+			return "vaurca"
diff --git a/html/changelogs/geeves-hardsuit_access_disabling.yml b/html/changelogs/geeves-hardsuit_access_disabling.yml
new file mode 100644
index 00000000000..20ecbcc7ac6
--- /dev/null
+++ b/html/changelogs/geeves-hardsuit_access_disabling.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - tweak: "Disabling the access lock on a hardsuit maintenance panel now unlocks the hardsuit entirely, meaning anyone can use it."
\ No newline at end of file