diff --git a/tools/pi_control/terminal_entry.sh b/tools/pi_control/terminal_entry.sh
index 91cf0db..ae4ff96 100644
--- a/tools/pi_control/terminal_entry.sh
+++ b/tools/pi_control/terminal_entry.sh
@@ -54,7 +54,7 @@ fi
 
 SSH_TARGET="${USER}@${HOST}"
 if [[ -n "${COMMAND}" ]]; then
-  REMOTE_CMD="${COMMAND}; exec \$SHELL -l"
+  REMOTE_CMD="${COMMAND}; exec /bin/bash -l || exec /bin/sh -l"
   REMOTE_CMD="${REMOTE_CMD//\\/\\\\}"
   REMOTE_CMD="${REMOTE_CMD//\"/\\\"}"
   if [[ "${AUTH_TYPE}" == "key" && -n "${KEY_PATH}" ]]; then
@@ -65,7 +65,7 @@ if [[ -n "${COMMAND}" ]]; then
     exec ssh "${SSH_OPTS[@]}" -p "${PORT:-22}" -tt "${SSH_TARGET}" -- sh -lc "${REMOTE_CMD}"
   fi
 else
-  REMOTE_CMD="exec \$SHELL -l"
+  REMOTE_CMD="exec /bin/bash -l || exec /bin/sh -l"
   if [[ "${AUTH_TYPE}" == "key" && -n "${KEY_PATH}" ]]; then
     exec ssh "${SSH_OPTS[@]}" -i "${KEY_PATH}" -p "${PORT:-22}" -tt "${SSH_TARGET}" -- sh -lc "${REMOTE_CMD}"
   elif [[ "${AUTH_TYPE}" == "pass" && -n "${PASSWORD}" ]]; then