diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index a040649f0..fa31bb851 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -1392,6 +1392,7 @@ Other:
 **** Elfeed
 - Fixed selection bindings in visual state (thanks to Jeremy Symon)
 - Fixed not saving on quit (thanks to Andrew Stevanus)
+- Make elfeed-goodies optional (thanks to Benjamin Sigonneau)
 **** Elixir
 - Added missing Alchemist commands and key bindings (thanks to Swaroop C H)
   - Key bindings:
diff --git a/layers/+readers/elfeed/config.el b/layers/+readers/elfeed/config.el
index a87ea6181..be3a93366 100644
--- a/layers/+readers/elfeed/config.el
+++ b/layers/+readers/elfeed/config.el
@@ -13,3 +13,5 @@
 
 (defvar elfeed-enable-web-interface nil
   "If non nil start a web server to consult the database in a web browser.")
+(defvar elfeed-enable-goodies nil
+  "If non nil enable elfeed-goodies (split-pane...).")
diff --git a/layers/+readers/elfeed/packages.el b/layers/+readers/elfeed/packages.el
index 04c945e18..1858ac514 100644
--- a/layers/+readers/elfeed/packages.el
+++ b/layers/+readers/elfeed/packages.el
@@ -46,15 +46,17 @@
         "y"  'elfeed-search-yank))))
 
 (defun elfeed/pre-init-elfeed-goodies ()
-  (spacemacs|use-package-add-hook elfeed
-    :post-config
-    (progn
-      (elfeed-goodies/setup)
-      (evil-define-key 'evilified elfeed-show-mode-map
-        "o" 'elfeed-goodies/show-ace-link))))
+  (when elfeed-enable-goodies
+    (spacemacs|use-package-add-hook elfeed
+      :post-config
+      (progn
+        (elfeed-goodies/setup)
+        (evil-define-key 'evilified elfeed-show-mode-map
+          "o" 'elfeed-goodies/show-ace-link)))))
 
 (defun elfeed/init-elfeed-goodies ()
-  (use-package elfeed-goodies :commands elfeed-goodies/setup))
+  (when elfeed-enable-goodies
+    (use-package elfeed-goodies :commands elfeed-goodies/setup)))
 
 (defun elfeed/pre-init-elfeed-org ()
   (when (boundp 'rmh-elfeed-org-files)