diff --git a/.github/workflows/ts_test.yml b/.github/workflows/ts_test.yml
index 9fb63655b1..7bc1ff0afd 100644
--- a/.github/workflows/ts_test.yml
+++ b/.github/workflows/ts_test.yml
@@ -62,6 +62,11 @@ jobs:
     name: Test TS packages against sync-service
     needs: [list_ts_packages]
     runs-on: ubuntu-latest
+    # There is currently a buggy TS test that causes the job for typescript-client to get stuck
+    # for 6 hours on end.
+    # And it's a good practice in general to limit the test runtime and investigate at the
+    # point when it starts exceeding the limit.
+    timeout-minutes: 10
     strategy:
       fail-fast: false
       matrix: