     (elfeed)
     (elfeed-search-set-filter filter-or-id)))
 
-;; Register Elfeed with Org
-(if (version< (org-version) "9.0")
+;;;###autoload
+(with-eval-after-load 'org
+  (if (version< (org-version) "9.0")
+      (with-no-warnings
+        (org-add-link-type "elfeed" #'elfeed-link-open)
+        (add-hook 'org-store-link-functions #'elfeed-link-store-link))
     (with-no-warnings
-      (org-add-link-type "elfeed" #'elfeed-link-open)
-      (add-hook 'org-store-link-functions #'elfeed-link-store-link))
-  (with-no-warnings
-    (org-link-set-parameters
-     "elfeed"
-     :follow #'elfeed-link-open
-     :store #'elfeed-link-store-link)))
+      (org-link-set-parameters
+       "elfeed"
+       :follow #'elfeed-link-open
+       :store #'elfeed-link-store-link))))
 
 (provide 'elfeed-link)
 
-;;;###autoload
-(eval-after-load 'org '(require 'elfeed-link))
-
 ;;; elfeed-link.el ends here

                            (intern (concat "elfeed-entry-" (symbol-name prop)))
                            elfeed-show-entry)))))))

(defun elfeed-link-open (filter-or-id)
  "Jump to an elfeed entry or search.


(require 'elfeed-show)
(require 'elfeed-search)

;;;###autoload
(defun elfeed-link-store-link ()
  "Store a link to an elfeed search or entry buffer.

