diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go
index ba4a09f6f01..a71169ac376 100644
--- a/pkg/api/dashboard_snapshot.go
+++ b/pkg/api/dashboard_snapshot.go
@@ -99,8 +99,14 @@ func CreateDashboardSnapshot(c *m.ReqContext, cmd m.CreateDashboardSnapshotComma
 
 		metrics.M_Api_Dashboard_Snapshot_External.Inc()
 	} else {
-		cmd.Key = util.GetRandomString(32)
-		cmd.DeleteKey = util.GetRandomString(32)
+		if cmd.Key == "" {
+			cmd.Key = util.GetRandomString(32)
+		}
+
+		if cmd.DeleteKey == "" {
+			cmd.DeleteKey = util.GetRandomString(32)
+		}
+
 		url = setting.ToAbsUrl("dashboard/snapshot/" + cmd.Key)
 
 		metrics.M_Api_Dashboard_Snapshot_Create.Inc()