diff --git a/emu-configs/mame/mame.ini b/emu-configs/mame/mame.ini
index 7ebb9ec0..53d8e418 100644
--- a/emu-configs/mame/mame.ini
+++ b/emu-configs/mame/mame.ini
@@ -27,7 +27,7 @@ swpath                    /app/share/mame/software
 cfg_directory             /var/config/mame/cfg
 nvram_directory           /var/config/mame/nvram
 input_directory           /var/config/mame/inp
-state_directory           /var/config/mame/sta
+state_directory           RETRODECKSAVESDIR/mame-sa
 snapshot_directory        RETRODECKHOMEDIR/screenshots
 diff_directory            /var/config/mame/diff
 comment_directory         /var/config/mame/comments
diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh
index aa92e652..0701df4d 100644
--- a/functions/prepare_emulator.sh
+++ b/functions/prepare_emulator.sh
@@ -708,10 +708,12 @@ prepare_emulator() {
     echo "Initializing MAME"
     echo "----------------------"
 
+    mkdir -p $saves_folder/mame-sa
     mkdir -p "/var/config/mame"
     cp -fvr "$emuconfigs/mame/**" "/var/config/mame"
     sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "/var/config/gzdoom/*.ini"
     sed -i 's#RETRODECKHOMESDIR#'$rdhome'#g' "/var/config/gzdoom/*.ini"
+    sed -i 's#RETRODECKSAVESDIR#'$rdhome'#g' "/var/config/gzdoom/*.ini"
 
   fi