diff --git a/modules/tools/terraform/config.el b/modules/tools/terraform/config.el
index 2739e6f90..b13df33ae 100644
--- a/modules/tools/terraform/config.el
+++ b/modules/tools/terraform/config.el
@@ -6,3 +6,9 @@
         :n "a" (λ! (compile "terraform apply"))
         :n "i" (λ! (compile "terraform init"))
         :n "p" (λ! (compile "terraform plan"))))
+
+(def-package! company-terraform
+  :when (featurep! :completion company)
+  :after terraform-mode
+  :config
+  (set-company-backend! 'terraform-mode 'company-terraform))
diff --git a/modules/tools/terraform/packages.el b/modules/tools/terraform/packages.el
index 52cd47686..15e0d18a1 100644
--- a/modules/tools/terraform/packages.el
+++ b/modules/tools/terraform/packages.el
@@ -3,4 +3,5 @@
 
 
 (package! terraform-mode)
-(package! company-terraform)
+(when (featurep! :completion company)
+  (package! company-terraform))