diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el
index 8e6be2a5f..b154a0da0 100644
--- a/modules/config/default/+emacs-bindings.el
+++ b/modules/config/default/+emacs-bindings.el
@@ -506,8 +506,9 @@
       "C-x K"       #'doom/kill-this-buffer-in-all-windows
 
       ;;; company-mode
-      "C-;" #'+company/complete
-      (:after company
+      (:when (modulep! :completion company)
+       "C-;" #'+company/complete
+       (:after company
         :map company-active-map
         "C-o"        #'company-search-kill-others
         "C-n"        #'company-select-next
@@ -528,7 +529,7 @@
         :map company-search-map
         "C-n"        #'company-search-repeat-forward
         "C-p"        #'company-search-repeat-backward
-        "C-s"        (cmd! (company-search-abort) (company-filter-candidates)))
+        "C-s"        (cmd! (company-search-abort) (company-filter-candidates))))
 
       ;;; ein notebooks
       (:after ein:notebook-multilang