diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk
index 0812739..52d13b5 100644
--- a/lib/make/mb_openmsx.mk
+++ b/lib/make/mb_openmsx.mk
@@ -18,6 +18,8 @@ MB_OPENMSX_ARGS = \
define _mb_openmsx_run
@echo === Running openMSX
$(call mb_msxhub_file,$(PATH_MSXBUILD_REAL)/lib/openmsx,OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl)
+ SAVE_SETTINGS_ON_EXIT=off \
+ THROTTLE=off \
FAIL_AFTER_BOOT=$(MB_OPENMSX_BOOT_TIMEOUT) \
FAIL_AFTER_PATH=bin \
BOOT_HDD_PATH="$(1)" \
diff --git a/lib/openmsx/boot_env.tcl b/lib/openmsx/boot_env.tcl
index e44a32d..70edb9b 100644
--- a/lib/openmsx/boot_env.tcl
+++ b/lib/openmsx/boot_env.tcl
@@ -3,7 +3,7 @@
# Typically used in automation tools which run openMSX without human interaction.
# Supported environment variables by this script;
#
-# SAVE_SETTINGS_ON_EXIT=false
+# SAVE_SETTINGS_ON_EXIT=off
# Disables automatic settings saving.
#
# RENDERER=SDL
diff --git a/lib/openmsx/boot_stdio.xml b/lib/openmsx/boot_stdio.xml
index 04e88f5..6cfb7ca 100644
--- a/lib/openmsx/boot_stdio.xml
+++ b/lib/openmsx/boot_stdio.xml
@@ -4,6 +4,4 @@ When booting 'openmsx -control stdio < boot_stdio.xml'
It starts then in power off mode and without renderer for fast booting.
-->
set power on
- set throttle off
- set save_settings_on_exit off