diff --git a/modules/lang/crystal/config.el b/modules/lang/crystal/config.el
index ece217290..3af3368cf 100644
--- a/modules/lang/crystal/config.el
+++ b/modules/lang/crystal/config.el
@@ -17,5 +17,11 @@
   :after crystal-mode)
 
 
+(use-package! flycheck-ameba
+  :when (featurep! :tools flycheck)
+  :after crystal-mode
+  :config (flycheck-ameba-setup))
+
+
 (use-package! inf-crystal
   :commands crystal-switch-to-inf)
diff --git a/modules/lang/crystal/packages.el b/modules/lang/crystal/packages.el
index e9fd0086b..0df4c86b9 100644
--- a/modules/lang/crystal/packages.el
+++ b/modules/lang/crystal/packages.el
@@ -2,5 +2,7 @@
 ;;; lang/crystal/packages.el
 
 (package! crystal-mode)
-(package! flycheck-crystal)
 (package! inf-crystal)
+(when (featurep! :tools flycheck)
+  (package! flycheck-crystal)
+  (package! flycheck-ameba))