diff --git a/lsp-pyls.el b/lsp-pyls.el
index 2ca48d29080..2156eb411d9 100644
--- a/lsp-pyls.el
+++ b/lsp-pyls.el
@@ -269,7 +269,13 @@ dot."
   :group 'lsp-pyls
   :package-version '(lsp-mode . "6.1"))
 
-(defcustom lsp-pyls-plugins-yapf-enabled t
+(defcustom lsp-pyls-plugins-autopep8-enabled t
+  "Enable or disable the plugin."
+  :type 'boolean
+  :group 'lsp-pyls
+  :package-version '(lsp-mode . "6.2"))
+
+(defcustom lsp-pyls-plugins-yapf-enabled nil
   "Enable or disable the plugin."
   :type 'boolean
   :group 'lsp-pyls
@@ -350,6 +356,7 @@ parameters referenced in config."
 (lsp-register-custom-settings
  '(("pyls.rope.ropeFolder" lsp-pyls-rope-rope-folder)
    ("pyls.rope.extensionModules" lsp-pyls-rope-extension-modules)
+   ("pyls.plugins.autopep8.enabled" lsp-pyls-plugins-autopep8-enabled t)
    ("pyls.plugins.yapf.enabled" lsp-pyls-plugins-yapf-enabled t)
    ("pyls.plugins.rope_completion.enabled" lsp-pyls-plugins-rope-completion-enabled t)
    ("pyls.plugins.pyflakes.enabled" lsp-pyls-plugins-pyflakes-enabled t)