diff --git a/internal/lsp/cache/view.go b/internal/lsp/cache/view.go
index 10b428383f..a56a9deec0 100644
--- a/internal/lsp/cache/view.go
+++ b/internal/lsp/cache/view.go
@@ -247,9 +247,6 @@ func (v *view) buildBuiltinPackage(ctx context.Context, m *metadata) error {
 		data.pkg, data.err = ast.NewPackage(fset, map[string]*ast.File{
 			pgh.File().Identity().URI.Filename(): file,
 		}, nil, nil)
-		if err != nil {
-			return err
-		}
 		return data
 	})
 	v.builtin = &builtinPackageHandle{
diff --git a/internal/lsp/source/options.go b/internal/lsp/source/options.go
index 6b8b52c89c..fc3c7b4a8f 100644
--- a/internal/lsp/source/options.go
+++ b/internal/lsp/source/options.go
@@ -28,7 +28,6 @@ import (
 	"golang.org/x/tools/go/analysis/passes/nilfunc"
 	"golang.org/x/tools/go/analysis/passes/nilness"
 	"golang.org/x/tools/go/analysis/passes/printf"
-	"golang.org/x/tools/go/analysis/passes/shadow"
 	"golang.org/x/tools/go/analysis/passes/shift"
 	"golang.org/x/tools/go/analysis/passes/sortslice"
 	"golang.org/x/tools/go/analysis/passes/stdmethods"
@@ -495,7 +494,6 @@ var defaultAnalyzers = map[string]*analysis.Analyzer{
 	// Non-vet analyzers
 	deepequalerrors.Analyzer.Name:  deepequalerrors.Analyzer,
 	nilness.Analyzer.Name:          nilness.Analyzer,
-	shadow.Analyzer.Name:           shadow.Analyzer,
 	sortslice.Analyzer.Name:        sortslice.Analyzer,
 	testinggoroutine.Analyzer.Name: testinggoroutine.Analyzer,
 }