diff --git a/core/src/main/java/io/snappydata/impl/SnappyHiveCatalog.java b/core/src/main/java/io/snappydata/impl/SnappyHiveCatalog.java
index 1a443860b3..cace6e99cd 100644
--- a/core/src/main/java/io/snappydata/impl/SnappyHiveCatalog.java
+++ b/core/src/main/java/io/snappydata/impl/SnappyHiveCatalog.java
@@ -269,7 +269,8 @@ private HMSQuery getHMSQuery() {
 
   private <T> T handleFutureResult(Future<T> f) {
     try {
-      return f.get();
+      // Time out if it takes more than 30 seconds
+      return f.get(30, TimeUnit.SECONDS);
     } catch (ExecutionException e) {
       throw new RuntimeException(e.getCause());
     } catch (Exception e) {