diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e1d86ee7821..d5d735b30f4 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -484,6 +484,9 @@ Other Changes
   the example directory instead of server/solr. (Alexandre Rafalovitch, Anshum Gupta, hossman,
   Timothy Potter)
 
+* SOLR-6843: JMX RMI connector should be disabled by default but can be activated by
+  setting ENABLE_REMOTE_JMX_OPTS to true in solr.in.(sh|cmd). (Timothy Potter)
+
 ==================  4.10.3 ==================
 
 Bug Fixes
diff --git a/solr/bin/solr.in.cmd b/solr/bin/solr.in.cmd
index 983110464a8..607ae09464d 100644
--- a/solr/bin/solr.in.cmd
+++ b/solr/bin/solr.in.cmd
@@ -58,10 +58,10 @@ REM set SOLR_HOST=192.168.1.1
 REM By default the start script uses UTC; override the timezone if needed
 REM set SOLR_TIMEZONE=UTC
 
-REM By default the start script enables some RMI related parameters to allow attaching
-REM JMX savvy tools like VisualVM remotely, set to "false" to disable that behavior
-REM (recommended in production environments)
-set ENABLE_REMOTE_JMX_OPTS=true
+REM Set to true to activate the JMX RMI connector to allow remote JMX client applications
+REM to monitor the JVM hosting Solr; set to "false" to disable that behavior
+REM (false is recommended in production environments)
+set ENABLE_REMOTE_JMX_OPTS=false
 
 REM The script will use SOLR_PORT+10000 for the RMI_PORT or you can set it here
 REM set RMI_PORT=18983
diff --git a/solr/bin/solr.in.sh b/solr/bin/solr.in.sh
index b35395a575d..b61d9fe1f21 100644
--- a/solr/bin/solr.in.sh
+++ b/solr/bin/solr.in.sh
@@ -56,10 +56,10 @@ GC_TUNE="-XX:NewRatio=3 \
 # By default the start script uses UTC; override the timezone if needed
 #SOLR_TIMEZONE="UTC"
 
-# By default the start script enables some RMI related parameters to allow attaching
-# JMX savvy tools like VisualVM remotely, set to "false" to disable that behavior
-# (recommended in production environments)
-ENABLE_REMOTE_JMX_OPTS="true"
+# Set to true to activate the JMX RMI connector to allow remote JMX client applications
+# to monitor the JVM hosting Solr; set to "false" to disable that behavior
+# (false is recommended in production environments)
+ENABLE_REMOTE_JMX_OPTS="false"
 
 # The script will use SOLR_PORT+10000 for the RMI_PORT or you can set it here
 # RMI_PORT=18983