diff --git a/lua/plugins/configs/heirline.lua b/lua/plugins/configs/heirline.lua
index 034d625..60d5e6a 100644
--- a/lua/plugins/configs/heirline.lua
+++ b/lua/plugins/configs/heirline.lua
@@ -1,8 +1,9 @@
 return function(_, opts)
   local heirline = require "heirline"
-  local hl = require "astronvim.utils.status.hl"
   local C = require("astronvim.utils.status.env").fallback_colors
   local get_hlgroup = require("astronvim.utils").get_hlgroup
+  local lualine_mode = require("astronvim.utils.status.hl").lualine_mode
+  local function resolve_lualine(orig, ...) return (not orig or orig == "NONE") and lualine_mode(...) or orig end
 
   local function setup_colors()
     local Normal = get_hlgroup("Normal", { fg = C.fg, bg = C.bg })
@@ -24,16 +25,13 @@ return function(_, opts)
     local DiagnosticWarn = get_hlgroup("DiagnosticWarn", { fg = C.orange, bg = C.dark_bg })
     local DiagnosticInfo = get_hlgroup("DiagnosticInfo", { fg = C.white, bg = C.dark_bg })
     local DiagnosticHint = get_hlgroup("DiagnosticHint", { fg = C.bright_yellow, bg = C.dark_bg })
-    local HeirlineInactive = get_hlgroup("HeirlineInactive", { bg = nil }).bg
-      or hl.lualine_mode("inactive", C.dark_grey)
-    local HeirlineNormal = get_hlgroup("HeirlineNormal", { bg = nil }).bg or hl.lualine_mode("normal", C.blue)
-    local HeirlineInsert = get_hlgroup("HeirlineInsert", { bg = nil }).bg or hl.lualine_mode("insert", C.green)
-    local HeirlineVisual = get_hlgroup("HeirlineVisual", { bg = nil }).bg or hl.lualine_mode("visual", C.purple)
-    local HeirlineReplace = get_hlgroup("HeirlineReplace", { bg = nil }).bg or hl.lualine_mode("replace", C.bright_red)
-    local HeirlineCommand = get_hlgroup("HeirlineCommand", { bg = nil }).bg
-      or hl.lualine_mode("command", C.bright_yellow)
-    local HeirlineTerminal = get_hlgroup("HeirlineTerminal", { bg = nil }).bg
-      or hl.lualine_mode("insert", HeirlineInsert)
+    local HeirlineInactive = resolve_lualine(get_hlgroup("HeirlineInactive", { bg = nil }).bg, "inactive", C.dark_grey)
+    local HeirlineNormal = resolve_lualine(get_hlgroup("HeirlineNormal", { bg = nil }).bg, "normal", C.blue)
+    local HeirlineInsert = resolve_lualine(get_hlgroup("HeirlineInsert", { bg = nil }).bg, "insert", C.green)
+    local HeirlineVisual = resolve_lualine(get_hlgroup("HeirlineVisual", { bg = nil }).bg, "visual", C.purple)
+    local HeirlineReplace = resolve_lualine(get_hlgroup("HeirlineReplace", { bg = nil }).bg, "replace", C.bright_red)
+    local HeirlineCommand = resolve_lualine(get_hlgroup("HeirlineCommand", { bg = nil }).bg, "command", C.bright_yellow)
+    local HeirlineTerminal = resolve_lualine(get_hlgroup("HeirlineTerminal", { bg = nil }).bg, "insert", HeirlineInsert)
 
     local colors = astronvim.user_opts("heirline.colors", {
       close_fg = Error.fg,