diff --git a/common/src/main/java/tachyon/security/authentication/AuthenticationUtils.java b/common/src/main/java/tachyon/security/authentication/AuthenticationUtils.java
index <HASH>..<HASH> 100644
--- a/common/src/main/java/tachyon/security/authentication/AuthenticationUtils.java
+++ b/common/src/main/java/tachyon/security/authentication/AuthenticationUtils.java
@@ -102,7 +102,9 @@ public final class AuthenticationUtils {
    * @return An unconnected socket
    */
   public static TSocket createTSocket(InetSocketAddress address) {
-    return new TSocket(NetworkAddressUtils.getFqdnHost(address), address.getPort());
+    // TODO: make the timeout configurable.
+    return new TSocket(NetworkAddressUtils.getFqdnHost(address), address.getPort(),
+        30 * Constants.SECOND_MS);
   }
 
   private AuthenticationUtils() {} // prevent instantiation
Use timeout for thrift RPCs