diff --git a/pkg/golinters/gocritic.go b/pkg/golinters/gocritic.go
index 7fc791db3f02..f78c2cf90998 100644
--- a/pkg/golinters/gocritic.go
+++ b/pkg/golinters/gocritic.go
@@ -32,13 +32,12 @@ var (
 	isGoCriticDebug = logutils.HaveDebugTag(logutils.DebugKeyGoCritic)
 )
 
-func NewGoCritic(settings *config.GoCriticSettings, cfg *config.Config) *goanalysis.Linter {
+func NewGoCritic(settings *config.GoCriticSettings) *goanalysis.Linter {
 	var mu sync.Mutex
 	var resIssues []goanalysis.Issue
 
 	wrapper := &goCriticWrapper{
-		getConfigDir: cfg.GetConfigDir, // Config directory is filled after calling this constructor.
-		sizes:        types.SizesFor("gc", runtime.GOARCH),
+		sizes: types.SizesFor("gc", runtime.GOARCH),
 	}
 
 	analyzer := &analysis.Analyzer{
@@ -71,7 +70,9 @@ Dynamic rules are written declaratively with AST patterns, filters, report messa
 		nil,
 	).
 		WithContextSetter(func(context *linter.Context) {
-			wrapper.init(settings, context.Log)
+			wrapper.configDir = context.Cfg.GetConfigDir()
+
+			wrapper.init(context.Log, settings)
 		}).
 		WithIssuesReporter(func(*linter.Context) []goanalysis.Issue {
 			return resIssues
@@ -81,12 +82,12 @@ Dynamic rules are written declaratively with AST patterns, filters, report messa
 
 type goCriticWrapper struct {
 	settingsWrapper *goCriticSettingsWrapper
-	getConfigDir    func() string
+	configDir       string
 	sizes           types.Sizes
 	once            sync.Once
 }
 
-func (w *goCriticWrapper) init(settings *config.GoCriticSettings, logger logutils.Log) {
+func (w *goCriticWrapper) init(logger logutils.Log, settings *config.GoCriticSettings) {
 	if settings == nil {
 		return
 	}
@@ -206,7 +207,7 @@ func (w *goCriticWrapper) normalizeCheckerParamsValue(p any) any {
 		return rv.Bool()
 	case reflect.String:
 		// Perform variable substitution.
-		return strings.ReplaceAll(rv.String(), "${configDir}", w.getConfigDir())
+		return strings.ReplaceAll(rv.String(), "${configDir}", w.configDir)
 	default:
 		return p
 	}
diff --git a/pkg/lint/lintersdb/builder_linter.go b/pkg/lint/lintersdb/builder_linter.go
index 954315d33dda..08041dc58f95 100644
--- a/pkg/lint/lintersdb/builder_linter.go
+++ b/pkg/lint/lintersdb/builder_linter.go
@@ -228,7 +228,7 @@ func (b LinterBuilder) Build(cfg *config.Config) ([]*linter.Config, error) {
 			WithPresets(linter.PresetStyle).
 			WithURL("https://github.com/jgautheron/goconst"),
 
-		linter.NewConfig(golinters.NewGoCritic(&cfg.LintersSettings.Gocritic, cfg)).
+		linter.NewConfig(golinters.NewGoCritic(&cfg.LintersSettings.Gocritic)).
 			WithSince("v1.12.0").
 			WithPresets(linter.PresetStyle, linter.PresetMetaLinter).
 			WithLoadForGoAnalysis().