diff --git a/Makefile b/Makefile
index 0123e00..3fdb95e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,15 @@
 WEBPACK := ./node_modules/webpack-cli/bin/cli.js
 RELEASE_SCRIPT := bash tools/release.bash
 
+# The sed command and the third_party/google-protobuf-commonjs_strict folder are
+# needed because of https://github.com/protocolbuffers/protobuf/issues/7778.
+grpc_proto_gen:
+	(cd src/killSwitch && \
+		protoc -I=. --js_out=import_style=commonjs_strict:. api_proto/*.proto && \
+		protoc -I. --grpc-web_out=import_style=commonjs,mode=grpcwebtext:. api_proto/*.proto && \
+		(cd api_proto && \
+			sed -i -E "s/require\('google-protobuf\//require('..\/..\/third_party\/google-protobuf-commonjs_strict\//" *_pb.js ))
+
 node_deps:
 	npm ci --no-save