diff --git a/modules/ui/fill-column/autoload.el b/modules/ui/fill-column/autoload.el
index 2aede4639..a96814ea5 100644
--- a/modules/ui/fill-column/autoload.el
+++ b/modules/ui/fill-column/autoload.el
@@ -1,9 +1,12 @@
 ;;; ui/fill-column/autoload.el -*- lexical-binding: t; -*-
 
-;; DEPRECATED Replaced by `display-fill-column-indicator-mode' in Emacs 27+
-
 ;;;###autoload (autoload 'hl-fill-column-mode "hl-fill-column" nil t)
 
 ;;;###autoload
-(add-hook! '(text-mode-hook prog-mode-hook conf-mode-hook)
-           #'hl-fill-column-mode)
+;; Emacs 27 introduced `display-fill-column-indicator-mode' which should be
+;; used instead of `hl-fill-column-mode'
+(if (>= emacs-major-version 27)
+    (add-hook! '(text-mode-hook prog-mode-hook conf-mode-hook)
+               #'display-fill-column-indicator-mode)
+    (add-hook! '(text-mode-hook prog-mode-hook conf-mode-hook)
+               #'hl-fill-column-mode))
diff --git a/modules/ui/fill-column/packages.el b/modules/ui/fill-column/packages.el
index 83e03b79a..d2d48d959 100644
--- a/modules/ui/fill-column/packages.el
+++ b/modules/ui/fill-column/packages.el
@@ -1,4 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; ui/fill-column/packages.el
 
-(package! hl-fill-column :pin "5782a91ba0182c4e562fa0db6379ff9dd472856b")
+;; `hl-fill-column' is only used on Emacs versions before 27
+(when (< emacs-major-version 27)
+    (package! hl-fill-column :pin "5782a91ba0182c4e562fa0db6379ff9dd472856b"))