diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go
index 1c641d10c1c..8de96ec9f21 100644
--- a/pkg/api/dashboard_snapshot.go
+++ b/pkg/api/dashboard_snapshot.go
@@ -15,7 +15,7 @@ import (
 func CreateDashboardSnapshot(c *middleware.Context, cmd m.CreateDashboardSnapshotCommand) {
 	if cmd.External {
 		// external snapshot ref requires key and delete key
-		if cmd.Key != "" && cmd.DeleteKey != "" {
+		if cmd.Key == "" || cmd.DeleteKey == "" {
 			c.JsonApiErr(400, "Missing key and delete key for external snapshot", nil)
 			return
 		}
diff --git a/src/app/features/dashboard/shareSnapshotCtrl.js b/src/app/features/dashboard/shareSnapshotCtrl.js
index 240bd33488b..4006abfe4b5 100644
--- a/src/app/features/dashboard/shareSnapshotCtrl.js
+++ b/src/app/features/dashboard/shareSnapshotCtrl.js
@@ -102,7 +102,7 @@ function (angular, _) {
       // save external in local instance as well
       cmdData.external = true;
       cmdData.key = results.key;
-      cmdData.delete_key = results.delete_key;
+      cmdData.deleteKey = results.deleteKey;
       backendSrv.post('/api/snapshots/', cmdData);
     };
 
diff --git a/src/app/services/backendSrv.js b/src/app/services/backendSrv.js
index 13565342333..004bf663e86 100644
--- a/src/app/services/backendSrv.js
+++ b/src/app/services/backendSrv.js
@@ -54,12 +54,16 @@ function (angular, _, config) {
 
     this.request = function(options) {
       var httpOptions = {
-        url: config.appSubUrl + options.url,
+        url: options.url,
         method: options.method,
         data: options.data,
         params: options.params,
       };
 
+      if (httpOptions.url.indexOf('/') === 0) {
+        httpOptions.url = config.appSubUrl + httpOptions.url;
+      }
+
       return $http(httpOptions).then(function(results) {
         if (options.method !== 'GET') {
           if (results && results.data.message) {