diff --git a/lib/actions/thread-actions.js b/lib/actions/thread-actions.js
--- a/lib/actions/thread-actions.js
+++ b/lib/actions/thread-actions.js
@@ -235,6 +235,9 @@
   success: 'JOIN_THREAD_SUCCESS',
   failed: 'JOIN_THREAD_FAILED',
 });
+const joinThreadOptions = {
+  timeout: permissionsAndAuthRelatedRequestTimeout,
+};
 const joinThread =
   (
     callKeyserverEndpoint: CallKeyserverEndpoint,
@@ -243,7 +246,11 @@
     const keyserverID = extractKeyserverIDFromID(input.threadID);
     const requests = { [keyserverID]: input };
 
-    const responses = await callKeyserverEndpoint('join_thread', requests);
+    const responses = await callKeyserverEndpoint(
+      'join_thread',
+      requests,
+      joinThreadOptions,
+    );
     const response = responses[keyserverID];
     const userInfos = values(response.userInfos);
     return {