diff --git a/apps/els_core/src/els_config.erl b/apps/els_core/src/els_config.erl
index b8fe0f39a..e295c715e 100644
--- a/apps/els_core/src/els_config.erl
+++ b/apps/els_core/src/els_config.erl
@@ -163,7 +163,6 @@ do_initialize(RootUri, Capabilities, InitOptions, {ConfigPath, Config}) ->
   ok = set(otp_paths      , otp_paths(OtpPath, false) -- ExcludePaths),
   ok = set(lenses         , Lenses),
   ok = set(diagnostics    , Diagnostics),
-  ok = set(enabled_diagnostics, els_diagnostics:enabled_diagnostics()),
   %% All (including subdirs) paths used to search files with file:path_open/3
   ok = set( search_paths
           , lists:append([ project_paths(RootPath, AppsDirs, true)
diff --git a/apps/els_lsp/src/els_diagnostics.erl b/apps/els_lsp/src/els_diagnostics.erl
index 3e288ee15..9c9b4b303 100644
--- a/apps/els_lsp/src/els_diagnostics.erl
+++ b/apps/els_lsp/src/els_diagnostics.erl
@@ -90,7 +90,7 @@ make_diagnostic(Range, Message, Severity, Source) ->
 
 -spec run_diagnostics(uri()) -> [pid()].
 run_diagnostics(Uri) ->
-  [run_diagnostic(Uri, Id) || Id <- els_config:get(enabled_diagnostics)].
+  [run_diagnostic(Uri, Id) || Id <- enabled_diagnostics()].
 
 %%==============================================================================
 %% Internal Functions