diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f44f85d..e3c3e060 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ### New features
 TBD
 ### Bug fixes
-- Fix bug where trying to reconfigure unloaded server would stack ([Commit](https://gitlab.com/crafty-controller/crafty-4/-/commit/1b2fef06fb3b02b76c9506caf7e07e932df95fab))
+- Fix bug where trying to reconfigure unloaded server would stack ([Commit](https://gitlab.com/crafty-controller/crafty-4/-/commit/1b2fef06fb3b02b76c9506caf7e07e932df95fab) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/460))
 - Fix traceback error when a user click the roles config tab while already on the roles config page; **this is for new role creation only** ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/452))
 - Fix logic issue when removing items from backup exclusions ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/453))
 - Cleanup various JS errors ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/455))
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index cdb018ad..5e5fc86c 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -517,7 +517,7 @@ class PanelHandler(BaseHandler):
                         "log_path": server_temp_obj["log_path"],
                         "executable": server_temp_obj["executable"],
                         "execution_command": server_temp_obj["execution_command"],
-                        "shutdown_timeout": server_obj["shutdown_timeout"],
+                        "shutdown_timeout": server_temp_obj["shutdown_timeout"],
                         "stop_command": server_temp_obj["stop_command"],
                         "executable_update_url": server_temp_obj[
                             "executable_update_url"