diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst
index 393b54cb92a6..c29b7952ff04 100644
--- a/doc/source/admin/galaxy_options.rst
+++ b/doc/source/admin/galaxy_options.rst
@@ -511,7 +511,7 @@
     automatically if it cannot find a local copy and conda_exec is not
     configured. The default is true if running Galaxy from source, and
     false if running from installed packages.
-:Default: ``true``
+:Default: ``None``
 :Type: bool
 
 
@@ -5125,7 +5125,7 @@
     'deferred' are "materialized" (or undeferred) by the workflow
     scheduler. This might be a lengthy process. Setting this to 'True'
     will place the invocation back in the queue after materialization
-    before scheduling the workflow so it is less  likely to starve
+    before scheduling the workflow so it is less likely to starve
     other workflow scheduling. Ideally, Galaxy would allow more fine
     grain control of handlers but until then, this provides a way to
     tip the balance between "doing more work" and "being more fair".
diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample
index dca66e799347..394189c6d68f 100644
--- a/lib/galaxy/config/sample/galaxy.yml.sample
+++ b/lib/galaxy/config/sample/galaxy.yml.sample
@@ -591,7 +591,7 @@ galaxy:
   # automatically if it cannot find a local copy and conda_exec is not
   # configured. The default is true if running Galaxy from source, and
   # false if running from installed packages.
-  #conda_auto_init: true
+  #conda_auto_init: false
 
   # You must set this to true if conda_prefix and job_working_directory
   # are not on the same volume, or some conda dependencies will fail to
@@ -2753,7 +2753,7 @@ galaxy:
   # 'deferred' are "materialized" (or undeferred) by the workflow
   # scheduler. This might be a lengthy process. Setting this to 'True'
   # will place the invocation back in the queue after materialization
-  # before scheduling the workflow so it is less  likely to starve other
+  # before scheduling the workflow so it is less likely to starve other
   # workflow scheduling. Ideally, Galaxy would allow more fine grain
   # control of handlers but until then, this provides a way to tip the
   # balance between "doing more work" and "being more fair". The default
diff --git a/lib/galaxy/config/schemas/config_schema.yml b/lib/galaxy/config/schemas/config_schema.yml
index 06963d364186..f0ee832e34ec 100644
--- a/lib/galaxy/config/schemas/config_schema.yml
+++ b/lib/galaxy/config/schemas/config_schema.yml
@@ -382,7 +382,6 @@ mapping:
 
       conda_auto_init:
         type: bool
-        default: true
         required: false
         desc: |
           Set to true to instruct Galaxy to install Conda from the web automatically