diff --git a/modules/ui/ligatures/config.el b/modules/ui/ligatures/config.el
index a1a7e635a..d29c4d884 100644
--- a/modules/ui/ligatures/config.el
+++ b/modules/ui/ligatures/config.el
@@ -137,17 +137,24 @@ with `prettify-symbols-mode'. This variable controls where these are enabled.
 See `+ligatures-extras-in-modes' to control what major modes this function can
 and cannot run in."
   (when after-init-time
-    (when (+ligatures--enable-p +ligatures-in-modes)
-      (if (boundp '+ligature--composition-table)
-          (setq-local composition-function-table +ligature--composition-table)
-        (run-hooks '+ligatures--init-font-hook)
-        (setq +ligatures--init-font-hook nil)))
-    (when (and (featurep! +extra)
-               (+ligatures--enable-p +ligatures-extras-in-modes))
-      (prependq! prettify-symbols-alist (alist-get major-mode +ligatures-extra-alist)))
-    (when prettify-symbols-alist
-      (if prettify-symbols-mode (prettify-symbols-mode -1))
-      (prettify-symbols-mode +1))))
+    (let ((in-mode-p
+           (+ligatures--enable-p +ligatures-in-modes))
+          (in-mode-extras-p
+           (and (featurep! +extra)
+                (+ligatures--enable-p +ligatures-extras-in-modes))))
+      (when in-mode-p
+        (if (boundp '+ligature--composition-table)
+            (setq-local composition-function-table +ligature--composition-table)
+          (run-hooks '+ligatures--init-font-hook)
+          (setq +ligatures--init-font-hook nil)))
+      (when in-mode-extras-p
+        (prependq! prettify-symbols-alist
+                   (alist-get major-mode +ligatures-extra-alist)))
+      (when (and (or in-mode-p in-mode-extras-p)
+                 prettify-symbols-alist)
+        (when prettify-symbols-mode
+          (prettify-symbols-mode -1))
+        (prettify-symbols-mode +1)))))
 
 
 ;;