diff --git a/dokku b/dokku
index 46f8d6f92..73c31a50d 100755
--- a/dokku
+++ b/dokku
@@ -106,15 +106,12 @@ fi
 
 if [[ -n "$SSH_ORIGINAL_COMMAND" ]]; then
   export -n SSH_ORIGINAL_COMMAND
-  if [[ $1 =~ config-* ]] || [[ $1 =~ docker-options* ]]; then
-    xargs $0 <<<$SSH_ORIGINAL_COMMAND
-    exit $?
-  else
-    set -f
-    $0 $SSH_ORIGINAL_COMMAND
-    set +f
-    exit $?
-  fi
+  exit_code=0
+  set -f
+  xargs $0 <<<$SSH_ORIGINAL_COMMAND
+  echo $?
+  set +f
+  exit $exit_code
 fi
 
 if ! dokku_auth "$@"; then