diff --git a/Makefile b/Makefile
index a6520a6d..eb4174cd 100644
--- a/Makefile
+++ b/Makefile
@@ -199,9 +199,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=2017 ./...
+	$(GO) vet -vettool=$(GOBIN)/mattermost-govet -license -license.year=2017 $$($(GO) list ./... | grep -v /webapp/)
 endif
 
 ## Builds the server, if it exists, for all supported architectures, unless MM_SERVICESETTINGS_ENABLEDEVELOPER is set