diff --git a/libexec/rbenv-init b/libexec/rbenv-init
index a28b7fc4..5f9079a7 100755
--- a/libexec/rbenv-init
+++ b/libexec/rbenv-init
@@ -140,7 +140,6 @@ function rbenv
   end
 end
 EOS
-  exit 0
   ;;
 ksh )
   cat <<EOS
@@ -156,6 +155,7 @@ EOS
   ;;
 esac
 
+if [ "$shell" != "fish" ]; then
 IFS="|"
 cat <<EOS
   command="\$1"
@@ -171,3 +171,4 @@ cat <<EOS
   esac
 }
 EOS
+fi
diff --git a/test/init.bats b/test/init.bats
index 60a3328c..aa50f091 100644
--- a/test/init.bats
+++ b/test/init.bats
@@ -77,3 +77,20 @@ load test_helper
   assert_success
   refute_line 'setenv PATH "'${RBENV_ROOT}'/shims" $PATH ;'
 }
+
+@test "outputs sh-compatible syntax" {
+  run rbenv-init - bash
+  assert_success
+  assert_line '  case "$command" in'
+
+  run rbenv-init - zsh
+  assert_success
+  assert_line '  case "$command" in'
+}
+
+@test "outputs fish-specific syntax (fish)" {
+  run rbenv-init - fish
+  assert_success
+  assert_line '  switch "$command"'
+  refute_line '  case "$command" in'
+}