diff --git a/NodeBase/generate_config b/NodeBase/generate_config
index 54194c1655..a0cf89b649 100755
--- a/NodeBase/generate_config
+++ b/NodeBase/generate_config
@@ -44,7 +44,7 @@ if [[ -z "${SE_NODE_GRID_URL}" ]]; then
 else
 	echo "grid-url = \"${SE_NODE_GRID_URL}\"" >>"$FILENAME"
 fi
-echo "session-timeout = \"${SE_NODE_SESSION_TIMEOUT}\"" >>"$FILENAME"
+echo "session-timeout = ${SE_NODE_SESSION_TIMEOUT}" >>"$FILENAME"
 echo "override-max-sessions = ${SE_NODE_OVERRIDE_MAX_SESSIONS}" >>"$FILENAME"
 echo "detect-drivers = false" >>"$FILENAME"
 echo "drain-after-session-count = ${DRAIN_AFTER_SESSION_COUNT:-$SE_DRAIN_AFTER_SESSION_COUNT}" >>"$FILENAME"
diff --git a/NodeBase/start-selenium-node.sh b/NodeBase/start-selenium-node.sh
index 5fd27ebb2e..2b3241d661 100755
--- a/NodeBase/start-selenium-node.sh
+++ b/NodeBase/start-selenium-node.sh
@@ -53,10 +53,6 @@ if [[ -z "${SE_EVENT_BUS_SUBSCRIBE_PORT}" ]]; then
   exit 1
 fi
 
-if [ ! -z "$SE_NODE_SESSION_TIMEOUT" ]; then
-  append_se_opts "--session-timeout" "${SE_NODE_SESSION_TIMEOUT}"
-fi
-
 if [ ! -z "$SE_NODE_ENABLE_MANAGED_DOWNLOADS" ]; then
   append_se_opts "--enable-managed-downloads" "${SE_NODE_ENABLE_MANAGED_DOWNLOADS}"
 fi
diff --git a/Standalone/generate_config b/Standalone/generate_config
index 2f6474bd58..87494f2f75 100755
--- a/Standalone/generate_config
+++ b/Standalone/generate_config
@@ -25,7 +25,7 @@ if [[ -z "${SE_NODE_GRID_URL}" ]]; then
 else
 	echo "grid-url = \"${SE_NODE_GRID_URL}\"" >>"$FILENAME"
 fi
-echo "session-timeout = \"${SE_NODE_SESSION_TIMEOUT}\"" >>"$FILENAME"
+echo "session-timeout = ${SE_NODE_SESSION_TIMEOUT}" >>"$FILENAME"
 echo "override-max-sessions = ${SE_NODE_OVERRIDE_MAX_SESSIONS}" >>"$FILENAME"
 echo "detect-drivers = false" >>"$FILENAME"
 echo "drain-after-session-count = ${DRAIN_AFTER_SESSION_COUNT:-$SE_DRAIN_AFTER_SESSION_COUNT}" >>"$FILENAME"