diff --git a/lisp/init-eshell.el b/lisp/init-eshell.el
index fb25623ad..9fbe897f8 100644
--- a/lisp/init-eshell.el
+++ b/lisp/init-eshell.el
@@ -99,12 +99,12 @@
 (defalias 'eshell/more 'eshell/less)
 
 ;; Integrate helm
-(when (featurep 'helm)
-  (add-hook 'eshell-mode-hook
-            #'(lambda ()
-                (define-key eshell-mode-map
-                  [remap eshell-pcomplete]
-                  'helm-esh-pcomplete)))
+(eval-after-load 'helm
+  '(add-hook 'eshell-mode-hook
+             #'(lambda ()
+                 (define-key eshell-mode-map
+                   [remap eshell-pcomplete]
+                   'helm-esh-pcomplete)))
   )
 
 (provide 'init-eshell)