diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index d816ff413c3..a87a0cd4c28 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -1850,8 +1850,6 @@
 	if (prob(probability))
 		internal_tank_valve = rand(0,10000) // Screw up the cabin air pressure.
 		//This will probably kill the pilot if they dont check it before climbing in
-	if (prob(probability))
-		state = 1 // Enable maintenance mode. It won't move.
 	if (prob(probability))
 		use_internal_tank = !use_internal_tank // Flip internal tank mode on or off
 	if (prob(probability))
@@ -1864,6 +1862,9 @@
 		radio.set_frequency(rand(1200,1600))
 	if (prob(probability))
 		maint_access = 0 // Disallow maintenance mode
+	else
+		maint_access = 1 // Explicitly allow maint_access -> Othwerwise we have a stuck mech, as you cant change the state back, if maint_access is 0
+		state = 1 // Enable maintenance mode. It won't move.
 
 /////////////////////////////////////////
 //////// Mecha process() helpers ////////
diff --git a/html/changelogs/arrow768-mechs.yml b/html/changelogs/arrow768-mechs.yml
new file mode 100644
index 00000000000..7af535fb6d4
--- /dev/null
+++ b/html/changelogs/arrow768-mechs.yml
@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#################################
+
+# Your name.  
+author: Arrow768
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "NanoTrasen has updated the operating systems to prevent them from being stuck in maint mode after prolonged storage."