diff --git a/lgsm/modules/command_monitor.sh b/lgsm/modules/command_monitor.sh
index e9baf71e5..c4fc30f3b 100644
--- a/lgsm/modules/command_monitor.sh
+++ b/lgsm/modules/command_monitor.sh
@@ -109,6 +109,18 @@ fn_monitor_check_stopping() {
 	fi
 }
 
+fn_monitor_check_restart_request() {
+	if [ -f "${lockdir}/${selfname}-restart-request.lock" ]; then
+		fn_print_dots "Checking restart: "
+		fn_print_checking_eol
+		fn_print_info "Checking restart: Restart requested: "
+		fn_print_info_eol_nl
+		fn_script_log_info "Checking restart: Restart requested"
+		command_restart.sh
+		core_exit.sh
+	fi
+}
+
 fn_monitor_check_backup() {
 	# Remove stale lockfile.
 	if [ -f "${lockdir}/backup.lock" ]; then
@@ -416,4 +428,5 @@ if [ "${querymode}" != "1" ]; then
 
 	fn_monitor_loop
 fi
+fn_monitor_check_restart_request
 core_exit.sh
diff --git a/lgsm/modules/command_stop.sh b/lgsm/modules/command_stop.sh
index 8209cd951..6ebd86d0f 100644
--- a/lgsm/modules/command_stop.sh
+++ b/lgsm/modules/command_stop.sh
@@ -20,8 +20,12 @@ fn_stop_players_online() {
 					if [ -n "${gdplayers}" ] && [ "${gdplayers}" -ne 0 ]; then
 						fn_print_info "Server will not stop while ${gdplayers} players are on the server"
 						fn_script_log_info "Server will not stop while ${gdplayers} players are on the server"
+						date '+%s' > "${lockdir:?}/${selfname}-restart-request.lock"
 						core_exit.sh
 					else
+						if [ -f "${lockdir:?}/${selfname}-restart-request.lock" ]; then
+							rm -f "${lockdir:?}/${selfname}-restart-request.lock"
+						fi
 						break
 					fi
 				fi