diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index ceff6699..0747547f 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -7,9 +7,9 @@ return {
       "mason.nvim",
       { "williamboman/mason-lspconfig.nvim", config = function() end },
     },
-    ---@class PluginLspOpts
     opts = function()
-      return {
+      ---@class PluginLspOpts
+      local ret = {
         -- options for vim.diagnostic.config()
         ---@type vim.diagnostic.Opts
         diagnostics = {
@@ -114,6 +114,7 @@ return {
           -- ["*"] = function(server, opts) end,
         },
       }
+      return ret
     end,
     ---@param opts PluginLspOpts
     config = function(_, opts)
diff --git a/lua/lazyvim/util/toggle.lua b/lua/lazyvim/util/toggle.lua
index a81fa4d4..99721e06 100644
--- a/lua/lazyvim/util/toggle.lua
+++ b/lua/lazyvim/util/toggle.lua
@@ -112,17 +112,11 @@ M.number = {
   end,
 }
 
-local enabled = true
 ---@type lazyvim.Toggle
 M.diagnostics = {
   name = "Diagnostics",
   get = function()
-    if vim.diagnostic.is_enabled then
-      enabled = vim.diagnostic.is_enabled()
-    elseif vim.diagnostic.is_disabled then
-      enabled = not vim.diagnostic.is_disabled()
-    end
-    return enabled
+    return vim.diagnostic.is_enabled and vim.diagnostic.is_enabled()
   end,
   set = vim.diagnostic.enable,
 }