diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el
index e556da596..da1c8a4de 100644
--- a/modules/completion/ivy/autoload/ivy.el
+++ b/modules/completion/ivy/autoload/ivy.el
@@ -224,14 +224,10 @@ The point of this is to avoid Emacs locking up indexing massive file trees."
           #'counsel-find-file)
 
          ((doom-project-p 'nocache)
-          #'projectile-find-file)
-
-         ;; FIXME When counsel-projectile-find-file is fixed upstream
-         ;; ((doom-project-p 'nocache)
-         ;;  (let ((files (projectile-current-project-files)))
-         ;;    (if (<= (length files) ivy-sort-max-size)
-         ;;        #'counsel-projectile-find-file
-         ;;      #'projectile-find-file)))
+          (let ((files (projectile-current-project-files)))
+            (if (<= (length files) ivy-sort-max-size)
+                #'counsel-projectile-find-file
+              #'projectile-find-file)))
 
          (#'counsel-file-jump))))
 
diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el
index 5b87887ac..62a3d96dc 100644
--- a/modules/completion/ivy/config.el
+++ b/modules/completion/ivy/config.el
@@ -149,6 +149,7 @@ immediately runs it on the current candidate (ending the ivy session)."
 
 
 (def-package! counsel-projectile
+  :disabled t
   :commands (counsel-projectile-find-file counsel-projectile-find-dir counsel-projectile-switch-to-buffer
              counsel-projectile-grep counsel-projectile-ag counsel-projectile-switch-project)
   :init