diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec3507dc715..ed407d70fef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 2.0.0 (unreleased)
 
 **Fixes**
+- [Issue #1784](https://github.com/grafana/grafana/issues/1784). Data source proxy: Fixed issue with using data source proxy when grafana is behind nginx suburl
 - [Issue #1749](https://github.com/grafana/grafana/issues/1749). Graph Panel: Table legends are now visible when rendered to PNG
 - [Issue #1786](https://github.com/grafana/grafana/issues/1786). Graph Panel: Legend in table mode now aligns, graph area is reduced depending on how many series
 - [Issue #1734](https://github.com/grafana/grafana/issues/1734). Support for unicode / international characters in dashboard title (improved slugify)
diff --git a/public/app/services/backendSrv.js b/public/app/services/backendSrv.js
index 52b4753dc3d..30cad361bbe 100644
--- a/public/app/services/backendSrv.js
+++ b/public/app/services/backendSrv.js
@@ -93,10 +93,6 @@ function (angular, _, config) {
       var requestIsLocal = options.url.indexOf('/') === 0;
       var firstAttempt = options.retry === 0;
 
-      if (requestIsLocal && firstAttempt) {
-        options.url = config.appSubUrl + options.url;
-      }
-
       return $http(options).then(null, function(err) {
         // handle unauthorized for backend requests
         if (requestIsLocal && firstAttempt  && err.status === 401) {