diff --git a/packaging/standalone/src/main/distribution/shell-scripts/bin/ongdb b/packaging/standalone/src/main/distribution/shell-scripts/bin/ongdb
index c5d7e975fcf..f922d186dbc 100755
--- a/packaging/standalone/src/main/distribution/shell-scripts/bin/ongdb
+++ b/packaging/standalone/src/main/distribution/shell-scripts/bin/ongdb
@@ -248,7 +248,7 @@ _read_config() {
   # - keys have '.' chars changed to '_'
   # - keys of the form KEY.# (where # is a number) are concatenated into a single environment variable named KEY
   parse_line() {
-    line="$1"
+    line="${1//[$'\r\n']}"
     if [[ "${line}" =~ ^([^#\s][^=]+)=(.+)$ ]]; then
       key="${BASH_REMATCH[1]//./_}"
       value="${BASH_REMATCH[2]}"
@@ -320,6 +320,9 @@ print_active_database() {
   echo "Active database: ${dbms_active_database:-graph.db}"
 }
 
+use_default_main_class() {
+  MAIN_CLASS="#{ongdb.mainClass}"
+}
 
 setup_arbiter_options() {
   is_arbiter() {
@@ -339,7 +342,7 @@ setup_arbiter_options() {
   else
     SHUTDOWN_TIMEOUT="${ONGDB_SHUTDOWN_TIMEOUT:-120}"
     MIN_ALLOWED_OPEN_FILES=40000
-    MAIN_CLASS="#{ongdb.mainClass}"
+    use_default_main_class
 
     print_start_message() {
       # Global default
@@ -542,6 +545,8 @@ do_status() {
 }
 
 do_version() {
+  check_java
+  use_default_main_class
   build_classpath
 
   assemble_command_line
@@ -592,7 +597,6 @@ main() {
       ;;
 
     --version|version)
-      setup_java
       do_version
       ;;
 
diff --git a/packaging/standalone/src/tests/shell-scripts/test-java-arguments.sh b/packaging/standalone/src/tests/shell-scripts/test-java-arguments.sh
index cce53326c0f..e561348e2fe 100755
--- a/packaging/standalone/src/tests/shell-scripts/test-java-arguments.sh
+++ b/packaging/standalone/src/tests/shell-scripts/test-java-arguments.sh
@@ -5,22 +5,22 @@ test_description="Test Java arguments"
 . ./lib/sharness.sh
 fake_install
 
-test_expect_success "should set heap size constraints when checking version from wrapper conf" "
+test_expect_success "should not set heap size constraints when checking version from wrapper conf" "
   clear_config &&
   set_config 'dbms.memory.heap.initial_size' '512m' ongdb-wrapper.conf &&
   set_config 'dbms.memory.heap.max_size' '1024m' ongdb-wrapper.conf &&
   ongdb-home/bin/ongdb version || true &&
-  test_expect_java_arg '-Xms512m' &&
-  test_expect_java_arg '-Xmx1024m'
+  ! test_expect_java_arg '-Xms512m' &&
+  ! test_expect_java_arg '-Xmx1024m'
 "
 
-test_expect_success "should set heap size constraints when checking version" "
+test_expect_success "should not set heap size constraints when checking version" "
   clear_config &&
   set_config 'dbms.memory.heap.initial_size' '512m' ongdb.conf &&
   set_config 'dbms.memory.heap.max_size' '1024m' ongdb.conf &&
   ongdb-home/bin/ongdb version || true &&
-  test_expect_java_arg '-Xms512m' &&
-  test_expect_java_arg '-Xmx1024m'
+  ! test_expect_java_arg '-Xms512m' &&
+  ! test_expect_java_arg '-Xmx1024m'
 "
 
 for run_command in run_console run_daemon; do