diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index ada2ec88..c24b586f 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -54,6 +54,7 @@ pipelines:
               - npm install
               - npm run prettier:check
               - npm run lint
+              - npm run typecheck
         - step:
             name: cypress tests
             max-time: 45
diff --git a/git-pre-push.sh b/git-pre-push.sh
index d7f93556..8cb53b69 100755
--- a/git-pre-push.sh
+++ b/git-pre-push.sh
@@ -6,8 +6,8 @@ set -e
 echo 'prettier:check'
 (cd client && npm run prettier:check)
 
-echo 'lint'
-(cd client && npm run lint)
+echo 'lint and typecheck'
+(cd client && npm run lint && npm run typecheck)
 
 echo 'python ufmt check'
 ufmt check server