diff --git a/openbis/dist/server/setup-env b/openbis/dist/server/setup-env
index 5e73611bd2658c8bf02ff55f4ca819f54a82b2a0..498cdc2275ec4a18cee3f3d6918a2d9cb1202943 100644
--- a/openbis/dist/server/setup-env
+++ b/openbis/dist/server/setup-env
@@ -10,9 +10,10 @@ source "$JETTY_BIN_DIR"/jetty.properties
 source "$JETTY_BIN_DIR"/openbis.conf
 cd "$JETTY_BIN_DIR"/..
 
-JVM=java
 if [ -n "$JAVA_HOME" ]; then
     JVM="$JAVA_HOME"/bin/java
+else
+    JVM="`which java`"
 fi 
 
 JETTY_LIB_PATH="$JETTY_BIN_DIR"/../webapps/openbis/WEB-INF/jython-lib
\ No newline at end of file