diff --git a/package.json b/package.json
index 490afbd..f663963 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iknow-entity-browser",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Visualizer for iKnow entities",
   "main": "gulpfile.babel.js",
   "scripts": {
diff --git a/src/cls/EntityBrowser/API.cls b/src/cls/EntityBrowser/API.cls
index 57468d3..790b32b 100644
--- a/src/cls/EntityBrowser/API.cls
+++ b/src/cls/EntityBrowser/API.cls
@@ -113,6 +113,13 @@ XData UrlMap [ XMLNamespace = "http://www.intersystems.com/urlmap" ]
 </Routes>
 }
 
+/// Extend the timeout for the long queries up to 2 hours
+ClassMethod OnPreDispatch(pUrl As %String, pMethod As %String, ByRef pContinue As %Boolean) As %Status
+{
+	set %response.Timeout = 60 * 60 * 2 // 2 hours at max
+	return ##class(%iKnow.REST.Base).OnPreDispatch(pUrl, pMethod, pContinue)
+}
+
 /// <example language="swagger">
 ///       summary: |
 ///         Retrieves the graph representation of all entities similar to a seed string