diff --git a/projects/ArchR/packages/archr/config/system/configs/system.cfg b/projects/ArchR/packages/archr/config/system/configs/system.cfg
index dca536fdf0..17be19c224 100644
--- a/projects/ArchR/packages/archr/config/system/configs/system.cfg
+++ b/projects/ArchR/packages/archr/config/system/configs/system.cfg
@@ -183,7 +183,7 @@ system.hostname=@DEVICENAME@
 system.language=en_US
 system.loglevel=none
 system.merged.storage=0
-system.shutdown_delay=0
+system.shutdown_delay=900
 system.shutdown_delay_running_game=900
 system.suspend.park_cores=1
 system.suspend.dpms=1
diff --git a/projects/ArchR/packages/archr/sources/post-update b/projects/ArchR/packages/archr/sources/post-update
index 1f68ac51b5..8bd72abadb 100644
--- a/projects/ArchR/packages/archr/sources/post-update
+++ b/projects/ArchR/packages/archr/sources/post-update
@@ -199,7 +199,7 @@ grep -q "^global\.bezel=" /storage/.config/system/configs/system.cfg ||
 
 # set the default suspend shutdown delays if they doesn't already exist
 grep -q "^system\.shutdown_delay=" /storage/.config/system/configs/system.cfg ||
-  sed -i '$ a\system.shutdown_delay=0' /storage/.config/system/configs/system.cfg
+  sed -i '$ a\system.shutdown_delay=900' /storage/.config/system/configs/system.cfg
 
 grep -q "^system\.shutdown_delay_running_game=" /storage/.config/system/configs/system.cfg ||
   sed -i '$ a\system.shutdown_delay_running_game=900' /storage/.config/system/configs/system.cfg
diff --git a/projects/ArchR/packages/archr/sources/scripts/archr-fake-suspend b/projects/ArchR/packages/archr/sources/scripts/archr-fake-suspend
index 137499c147..02ace82f03 100755
--- a/projects/ArchR/packages/archr/sources/scripts/archr-fake-suspend
+++ b/projects/ArchR/packages/archr/sources/scripts/archr-fake-suspend
@@ -331,9 +331,9 @@ if [[ $HW_SUSPEND_ENABLED -eq 0 ]]; then
   exit 0
 fi
 
-# If a game is not running, by default shutdown immediately
+# If a game is not running, by default delay the shutdown for 15 minutes
 SHUTDOWN_DELAY="$(get_setting system.shutdown_delay)"
-[[ "${SHUTDOWN_DELAY}" = "" ]] && SHUTDOWN_DELAY=0
+[[ "${SHUTDOWN_DELAY}" = "" ]] && SHUTDOWN_DELAY=900
 
 # If a game is running, by default delay the shutdown for 15 minutes
 SHUTDOWN_DELAY_RUNNING_GAME="$(get_setting system.shutdown_delay_running_game)"