diff --git a/languageserver/Makefile b/languageserver/Makefile
index 6ed1dd96..e26e30ea 100644
--- a/languageserver/Makefile
+++ b/languageserver/Makefile
@@ -25,7 +25,7 @@ PATH := $(PATH):$(GOPATH)/bin
 .PHONY: build
 build:
 	go build -o ./cmd/languageserver/languageserver ./cmd/languageserver
-	# TODO: GOARCH=wasm GOOS=js go build -o ./cmd/languageserver/languageserver.wasm ./cmd/languageserver
+	GOARCH=wasm GOOS=js go build -o ./cmd/languageserver/languageserver.wasm -tags no_cgo ./cmd/languageserver
 
 .PHONY: generate
 generate:
@@ -34,7 +34,7 @@ generate:
 	go mod tidy
 
 .PHONY: test
-test: e2e-test generate unit-test # TODO: wasm-test
+test: e2e-test generate unit-test wasm-test
 
 .PHONY: unit-test
 unit-test:
diff --git a/npm-packages/cadence-language-server/package.json b/npm-packages/cadence-language-server/package.json
index 74dd68a0..a4a0d281 100644
--- a/npm-packages/cadence-language-server/package.json
+++ b/npm-packages/cadence-language-server/package.json
@@ -9,7 +9,7 @@
   },
   "main": "dist/index.js",
   "scripts": {
-    "build": "tsc && cd ../../languageserver && GOARCH=wasm GOOS=js go build -o ../npm-packages/cadence-language-server/dist/cadence-language-server.wasm ./cmd/languageserver && cd ../npm-packages/cadence-language-server",
+    "build": "tsc && cd ../../languageserver && GOARCH=wasm GOOS=js go build -o ../npm-packages/cadence-language-server/dist/cadence-language-server.wasm -tags no_cgo ./cmd/languageserver && cd ../npm-packages/cadence-language-server",
     "test": "jest"
   },
   "license": "Apache-2.0",