diff --git a/.emacs.d/lisp/init-helm.el b/.emacs.d/lisp/init-helm.el
index 138b3966..c9668c28 100644
--- a/.emacs.d/lisp/init-helm.el
+++ b/.emacs.d/lisp/init-helm.el
@@ -79,6 +79,12 @@
  helm-window-show-buffers-function 'helm-window-mosaic-fn
  helm-window-prefer-horizontal-split t)
 
+(unless helm-ff-keep-cached-candidates
+  ;; For removing hook from `post-command-hook' since
+  ;; `helm-ff-keep-cached-candidates' does not seem to do it.
+  ;; Upstream bug?
+  (helm-ff-cache-mode-remove-hooks))
+
 (defun ambrevar/helm-split-window-combined-fn (window)
   "Helm window splitting that combined most standard features.