diff --git a/bin/kyuubi-env.sh b/bin/kyuubi-env.sh
index 9cc099f43..a11f2ea10 100755
--- a/bin/kyuubi-env.sh
+++ b/bin/kyuubi-env.sh
@@ -26,4 +26,5 @@ if [ -z "$SPARK_HOME" ]; then
   exit 1
 fi
 
+export KYUUBI_HOME="$(cd "`dirname "$0"`"/..; pwd)"
 export KYUUBI_SUBMIT_ENABLE=true
diff --git a/bin/start-kyuubi.sh b/bin/start-kyuubi.sh
index cc913f69a..de6bb81a7 100755
--- a/bin/start-kyuubi.sh
+++ b/bin/start-kyuubi.sh
@@ -19,10 +19,9 @@
 
 ## Kyuubi Server Main Entrance
 CLASS="yaooqinn.kyuubi.server.KyuubiServer"
-export KYUUBI_HOME="$(cd "`dirname "$0"`"/..; pwd)"
 
 set -a
-. "${KYUUBI_HOME}/bin/kyuubi-env.sh"
+. "${PWD}/kyuubi-env.sh"
 set +a
 
 function usage {