diff --git a/lua/rose-pine.lua b/lua/rose-pine.lua
index 9240a51d..c546297d 100644
--- a/lua/rose-pine.lua
+++ b/lua/rose-pine.lua
@@ -780,10 +780,10 @@ local function set_highlights()
 			end
 
 			if (highlight.inherit == nil or highlight.inherit) and existing ~= nil then
-				highlight.inherit = nil
+				parsed.inherit = nil
 				highlights[group] = vim.tbl_extend("force", existing, parsed)
 			else
-				highlight.inherit = nil
+				parsed.inherit = nil
 				highlights[group] = parsed
 			end
 		end
diff --git a/lua/rose-pine/config.lua b/lua/rose-pine/config.lua
index f127e330..cb991374 100644
--- a/lua/rose-pine/config.lua
+++ b/lua/rose-pine/config.lua
@@ -141,16 +141,13 @@ local function migrate(options)
 
 	-- Set h1 through h6 to the same color if only one is specified
 	if type(options.groups.headings) == "string" then
-		options.groups.headings = {
-			h1 = options.groups.headings,
-			h2 = options.groups.headings,
-			h3 = options.groups.headings,
-			h4 = options.groups.headings,
-			h5 = options.groups.headings,
-			h6 = options.groups.headings,
-		}
-	end
-	if type(options.groups.headings) == "table" then
+		options.groups.h1 = options.groups.headings
+		options.groups.h2 = options.groups.headings
+		options.groups.h3 = options.groups.headings
+		options.groups.h4 = options.groups.headings
+		options.groups.h5 = options.groups.headings
+		options.groups.h6 = options.groups.headings
+	elseif options.groups.headings == "table" then
 		options.groups.h1 = options.groups.headings.h1 or options.groups.h1
 		options.groups.h2 = options.groups.headings.h2 or options.groups.h2
 		options.groups.h3 = options.groups.headings.h3 or options.groups.h3
@@ -158,6 +155,7 @@ local function migrate(options)
 		options.groups.h5 = options.groups.headings.h5 or options.groups.h5
 		options.groups.h6 = options.groups.headings.h6 or options.groups.h6
 	end
+	options.groups.headings = nil
 
 	return options
 end