diff --git a/OrbitOne.BuildScreen/OrbitOne.BuildScreen.Services.Tfs/TfsService.cs b/OrbitOne.BuildScreen/OrbitOne.BuildScreen.Services.Tfs/TfsService.cs
index 401bc7d..0ce6e92 100644
--- a/OrbitOne.BuildScreen/OrbitOne.BuildScreen.Services.Tfs/TfsService.cs
+++ b/OrbitOne.BuildScreen/OrbitOne.BuildScreen.Services.Tfs/TfsService.cs
@@ -185,6 +185,8 @@ private IBuildDetail GetBuild(IBuildServer buildServer, CatalogNode teamProjectN
                 buildDetailSpec.MaxBuildsPerDefinition = 1;
                 buildDetailSpec.QueryOrder = BuildQueryOrder.FinishTimeDescending;
                 buildDetailSpec.MinFinishTime = filterDate;
+                buildDetailSpec.InformationTypes = null;
+                buildDetailSpec.QueryOptions = QueryOptions.Definitions | QueryOptions.BatchedRequests;
 
                 build = buildServer.QueryBuilds(buildDetailSpec).Builds.FirstOrDefault();
             }
@@ -207,6 +209,8 @@ private TimeSpan GetLastSuccesfulBuildTime(IBuildServer buildServer, CatalogNode
                 inProgressBuildDetailSpec.Status = BuildStatus.Succeeded;
                 inProgressBuildDetailSpec.MaxBuildsPerDefinition = 1;
                 inProgressBuildDetailSpec.QueryOrder = BuildQueryOrder.FinishTimeDescending;
+                inProgressBuildDetailSpec.InformationTypes = null;
+                inProgressBuildDetailSpec.QueryOptions = QueryOptions.None;
 
                 var lastSuccesfulBuild = buildServer.QueryBuilds(inProgressBuildDetailSpec).Builds.FirstOrDefault();