diff --git a/buildroot-external/board/raspberrypi/rpi5-64/rootfs-overlay/usr/lib/rauc/rpi-tryboot.sh b/buildroot-external/board/raspberrypi/rpi5-64/rootfs-overlay/usr/lib/rauc/rpi-tryboot.sh
index af0d866c4..d78129da8 100755
--- a/buildroot-external/board/raspberrypi/rpi5-64/rootfs-overlay/usr/lib/rauc/rpi-tryboot.sh
+++ b/buildroot-external/board/raspberrypi/rpi5-64/rootfs-overlay/usr/lib/rauc/rpi-tryboot.sh
@@ -10,19 +10,30 @@ boot_dir="/mnt/boot"
 root_slot_a="PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd"
 root_slot_b="PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20"
 
+get_primary() {
+    echo "tryboot get-primary" >&2
+    cmdline=$(head -n1 "${boot_dir}/cmdline.txt")
+    get_value rauc.slot "${cmdline}"
+}
+
 case "$1" in
     get-primary)
         # Actions to be performed when getting the primary bootloader
         # Example: Output the path to the current primary bootloader
-        echo "tryboot get-primary" >&2
-        cmdline=$(head -n1 "${boot_dir}/cmdline.txt")
-        get_value rauc.slot "${cmdline}"
+        get_primary
         ;;
 
     set-primary)
         # Actions to be performed when setting the primary bootloader
         # Example: Set the specified bootloader as the primary one
         slot_bootname="$2"
+
+        # Do nothing if we're already booted in the requested slot
+        if [ "$(get_primary)" = "${slot_bootname}" ]; then
+            echo "tryboot set-primary $slot_bootname: already set" >&2
+            exit 0
+        fi
+
         echo "tryboot set-primary $slot_bootname" >&2
         cmdline=$(head -n1 "${boot_dir}/cmdline.txt")
         if [ "${slot_bootname}" = "A" ]; then
@@ -85,6 +96,7 @@ case "$1" in
                 "${boot_dir}/tryboot.txt" > "${boot_dir}/config.txt"
             mv "${boot_dir}/cmdline-tryboot.txt" "${boot_dir}/cmdline.txt"
             rm "${boot_dir}/tryboot.txt"
+            rm /run/systemd/reboot-param
         fi
         ;;