diff --git a/modules/lang/dart/+flutter.el b/modules/lang/dart/+flutter.el
deleted file mode 100644
index f31283902..000000000
--- a/modules/lang/dart/+flutter.el
+++ /dev/null
@@ -1,7 +0,0 @@
-;;; lang/dart/+flutter.el -*- lexical-binding: t; -*-
-
-(use-package! flutter
-  :config
-  (map! :map dart-mode-map
-        :localleader
-        "r" #'flutter-run-or-hot-reload))
diff --git a/modules/lang/dart/config.el b/modules/lang/dart/config.el
index fc574a62e..95a0e2bef 100644
--- a/modules/lang/dart/config.el
+++ b/modules/lang/dart/config.el
@@ -1,12 +1,18 @@
 ;;; lang/dart/config.el -*- lexical-binding: t; -*-
 
-(cond ((featurep! +flutter) (load! "+flutter"))
-      ((featurep! +lsp)    (load! "+lsp")))
-
 (use-package! dart-mode
+  :defer t
   :config
-  (when (featurep! +flutter)
-    (if IS-LINUX
-      (setq lsp-dart-sdk-dir "/opt/flutter/bin/cache/dart-sdk/")))
+  (when (and (featurep! +flutter) IS-LINUX)
+    (setq lsp-dart-sdk-dir "/opt/flutter/bin/cache/dart-sdk/"))
   (when (featurep! +lsp)
-    (add-hook 'dart-mode-hook 'lsp)))
+    (add-hook 'dart-mode-local-vars-hook #'lsp!)))
+
+
+(when (featurep! +flutter)
+  (use-package! flutter
+    :defer t
+    :config
+    (map! :map dart-mode-map
+          :localleader
+          "r" #'flutter-run-or-hot-reload)))