diff --git a/.golangci.yml b/.golangci.yml
index 00cf9793f..c2e4e32cc 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -38,6 +38,8 @@ linters:
     unqueryvet:
       check-sql-builders: true
   exclusions:
+    paths:
+      - webapp/node_modules
     rules:
       - path: server/configuration.go
         linters:
diff --git a/Makefile b/Makefile
index b06cf09ff..d60780e9b 100644
--- a/Makefile
+++ b/Makefile
@@ -203,9 +203,9 @@ endif
 # weird reports at golangci-lint step
 ifneq ($(HAS_SERVER),)
 	@echo Running golangci-lint
-	$(GO) vet ./...
+	$(GO) vet $$($(GO) list ./... | grep -v /webapp/)
 	$(GOBIN)/golangci-lint run ./...
-	$(GO) vet -vettool=$(GOBIN)/mattermost-govet -license -license.year=2018 ./...
+	$(GO) vet -vettool=$(GOBIN)/mattermost-govet -license -license.year=2018 $$($(GO) list ./... | grep -v /webapp/)
 endif
 
 ## Builds the server, if it exists, for all supported architectures, unless MM_SERVICESETTINGS_ENABLEDEVELOPER is set
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 84ce4b74a..62b6540ec 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -9090,9 +9090,9 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
       "dev": true,
       "license": "ISC"
     },