diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 758572ddc..67432f66f 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -42,7 +42,8 @@
                            (bound-and-true-p yas-minor-mode)
                            (yas-maybe-expand-abbrev-key-filter 'yas-expand))
                       #'yas-expand
-                      (featurep! :completion company +tng)
+                      (and (bound-and-true-p company-mode)
+                           (featurep! :completion company +tng))
                       #'company-indent-or-complete-common)
       :m [tab] (cmds! (and (bound-and-true-p yas-minor-mode)
                            (evil-visual-state-p)