diff --git a/src/shell_snippets/pixi-bash.sh b/src/shell_snippets/pixi-bash.sh
index 9e10d8cc06..9bcb4059b4 100644
--- a/src/shell_snippets/pixi-bash.sh
+++ b/src/shell_snippets/pixi-bash.sh
@@ -1,14 +1,15 @@
 # shellcheck shell=bash
 pixi() {
-    local first_arg="$1"
-    local cmd="$PIXI_EXE $*"
+    local first_arg="${1-}"
 
-    eval "$cmd"
+    "${PIXI_EXE-}" "$@" || return $?
 
-    case "$first_arg" in
+    case "${first_arg-}" in
         add|a|remove|rm|install|i)
-            eval "$($PIXI_EXE shell-hook --change-ps1 false)"
+            eval "$("$PIXI_EXE" shell-hook --change-ps1 false)"
             hash -r
             ;;
-    esac
+    esac || :
+
+    return 0
 }
diff --git a/src/shell_snippets/pixi-zsh.sh b/src/shell_snippets/pixi-zsh.sh
index 8958c16c5d..04cd10448c 100644
--- a/src/shell_snippets/pixi-zsh.sh
+++ b/src/shell_snippets/pixi-zsh.sh
@@ -1,14 +1,15 @@
 # shellcheck disable=all
 pixi() {
-    local first_arg="$1"
-    local cmd="$PIXI_EXE $*"
+    local first_arg="${1-}"
 
-    eval "$cmd"
+    "${PIXI_EXE-}" "$@" || return $?
 
-    case "$first_arg" in
+    case "${first_arg-}" in
         add|a|remove|rm|install|i)
-            eval "$($PIXI_EXE shell-hook --change-ps1 false)"
+            eval "$("$PIXI_EXE" shell-hook --change-ps1 false)"
             rehash # Clear the command hash table in zsh
             ;;
-    esac
+    esac || :
+
+    return 0
 }