diff --git a/bin/manager_start.sh b/bin/manager_start.sh
index f997afe31..c36b28eda 100755
--- a/bin/manager_start.sh
+++ b/bin/manager_start.sh
@@ -55,6 +55,13 @@ if [ -n "$6" ]; then
   SPARK_SUBMIT_OPTIONS="$SPARK_SUBMIT_OPTIONS --proxy-user $6"
 fi
 
+if [ "$SEPARATE_EXECUTOR_LOGGING" = "true" ]
+then
+  export EXECUTOR_LOGGING_OPTS=""
+else
+  export EXECUTOR_LOGGING_OPTS="$LOGGING_OPTS"
+fi
+
 if [ -n "$JOBSERVER_KEYTAB" ]; then
   SPARK_SUBMIT_OPTIONS="$SPARK_SUBMIT_OPTIONS --keytab $JOBSERVER_KEYTAB"
 fi
@@ -64,7 +71,7 @@ if [ -z "${SJS_LAUNCHER}" ]; then
 fi
 
 cmd='$SJS_LAUNCHER --class $MAIN --driver-memory $JOBSERVER_MEMORY
-      --conf "spark.executor.extraJavaOptions=$LOGGING_OPTS"
+      --conf "spark.executor.extraJavaOptions=$EXECUTOR_LOGGING_OPTS"
       $SPARK_SUBMIT_OPTIONS
       --driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES $SPARK_SUBMIT_JAVA_OPTIONS"
       $JAR_FILE $3 $4 $CONF_FILE'
diff --git a/bin/server_start.sh b/bin/server_start.sh
index 7a478716e..c3ac9ea7d 100755
--- a/bin/server_start.sh
+++ b/bin/server_start.sh
@@ -47,8 +47,15 @@ if [ -z "${SJS_LAUNCHER}" ]; then
   export SJS_LAUNCHER="$SPARK_HOME/bin/spark-submit"
 fi
 
+if [ "$SEPARATE_EXECUTOR_LOGGING" = "true" ]
+then
+  export EXECUTOR_LOGGING_OPTS=""
+else
+  export EXECUTOR_LOGGING_OPTS="$LOGGING_OPTS"
+fi
+
 cmd='$SJS_LAUNCHER --class $MAIN --driver-memory $JOBSERVER_MEMORY
-  --conf "spark.executor.extraJavaOptions=$LOGGING_OPTS"
+  --conf "spark.executor.extraJavaOptions=$EXECUTOR_LOGGING_OPTS"
   --driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES"
   $@ $appdir/spark-job-server.jar $conffile'