diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java b/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java
index ad9ecf9e92d92..8ff7d89c4c21a 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/RestClient.java
@@ -169,6 +169,7 @@ public Builder(OkHttpClient.Builder httpClientBuilder, Retrofit.Builder retrofit
             // Set up OkHttp client
             this.httpClientBuilder = httpClientBuilder
                     .cookieJar(new JavaNetCookieJar(cookieManager))
+                    .readTimeout(30, TimeUnit.SECONDS)
                     .addInterceptor(userAgentInterceptor);
             this.retrofitBuilder = retrofitBuilder;
             this.buildable = new Buildable();
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/TaskGroupBase.java b/azure-client-runtime/src/main/java/com/microsoft/azure/TaskGroupBase.java
index d5a3a6250d2ca..46fe8d0f179f2 100644
--- a/azure-client-runtime/src/main/java/com/microsoft/azure/TaskGroupBase.java
+++ b/azure-client-runtime/src/main/java/com/microsoft/azure/TaskGroupBase.java
@@ -70,7 +70,7 @@ public void execute() throws Exception {
 
     @Override
     public Observable<T> executeAsync() {
-        return executeReadyTasksAsync();
+        return executeReadyTasksAsync().last();
     }
 
     @Override
@@ -101,6 +101,6 @@ public Observable<T> call(T t) {
                     }));
             nextNode = dag.getNext();
         }
-        return Observable.merge(observables).last();
+        return Observable.merge(observables);
     }
 }