diff --git a/layers/+completion/auto-completion/packages.el b/layers/+completion/auto-completion/packages.el
index c643d7d8c..e0884b41b 100644
--- a/layers/+completion/auto-completion/packages.el
+++ b/layers/+completion/auto-completion/packages.el
@@ -157,13 +157,14 @@
       (spacemacs/set-leader-keys "is" 'spacemacs/helm-yas)
       (setq helm-c-yas-space-match-any-greedy t))))
 
-(defun auto-completion/init-helm-company ()
-  (use-package helm-company
-    :if (configuration-layer/package-used-p 'company)
-    :defer t
-    :init
-    (with-eval-after-load 'company
+(defun auto-completion/pre-init-helm-company ()
+  (spacemacs|use-package-add-hook company
+    :post-config
+    (use-package helm-company
+      :defer t
+      :init
       (define-key company-active-map (kbd "C-/") 'helm-company))))
+(defun auto-completion/init-helm-company ())
 
 (defun auto-completion/init-hippie-exp ()
   ;; replace dabbrev-expand