diff --git a/bundles/grafana/metadata.py b/bundles/grafana/metadata.py
index d1231dd..c671f05 100644
--- a/bundles/grafana/metadata.py
+++ b/bundles/grafana/metadata.py
@@ -44,6 +44,10 @@ def nginx(metadata):
                         '/': {
                             'target': 'http://127.0.0.1:21010',
                         },
+                        '/api/ds/query': {
+                            'target': 'http://127.0.0.1:21010',
+                            'proxy_read_timeout': 300,
+                        },
                     },
                     'website_check_path': '/login',
                     'website_check_string': 'Grafana',
diff --git a/bundles/nginx/files/site_template b/bundles/nginx/files/site_template
index 1ab0149..5f3b9c7 100644
--- a/bundles/nginx/files/site_template
+++ b/bundles/nginx/files/site_template
@@ -107,6 +107,7 @@ server {
         proxy_set_header     X-Script-Name ${location};
 %    endif
         proxy_buffering      off;
+        proxy_read_timeout   ${options.get('proxy_read_timeout', 60)};
         client_max_body_size ${options.get('max_body_size', '5M')};
 %   elif 'redirect' in options:
         return ${options.get('mode', 302)} ${options['redirect']};