diff --git a/functions/checks.sh b/functions/checks.sh
index 710fd6c9..bb93b322 100644
--- a/functions/checks.sh
+++ b/functions/checks.sh
@@ -83,6 +83,7 @@ check_for_version_update() {
           local latest_cooker_download=$(curl --silent https://api.github.com/repos/XargonWan/$update_repo/releases/latest | grep '"browser_download_url":' | sed -E 's/.*"([^"]+)".*/\1/')
           mkdir -p "$rdhome/RetroDECK_Updates"
           wget -P "$rdhome/RetroDECK_Updates" $latest_cooker_download
+          flatpak-spawn --host flatpak remove --noninteractive -y net.retrodeck.retrodeck # Remove current version before installing new one, to avoid duplicates
           flatpak-spawn --host flatpak install --user --bundle --noninteractive -y "$rdhome/RetroDECK_Updates/RetroDECK-cooker.flatpak"
           rm -rf "$rdhome/RetroDECK_Updates" # Cleanup old bundles to save space
           ) |
diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh
index 441cc6b6..b4ade655 100644
--- a/functions/prepare_emulator.sh
+++ b/functions/prepare_emulator.sh
@@ -618,5 +618,7 @@ prepare_emulator() {
   fi
 
   # Update presets for all emulators after any reset or move
-  build_retrodeck_current_presets
+  if [[ ! "$emulator" == "retrodeck" ]]; then
+    build_retrodeck_current_presets
+  fi
 }