diff --git a/conf/defaults.ini b/conf/defaults.ini
index 2709e36882c..2c3064ecf22 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -187,10 +187,10 @@ snapshot_remove_expired = true
 # remove snapshots after 90 days
 snapshot_TTL_days = 90
 
-#################################### Dashboards History ##################
+#################################### Dashboards ##################
+
 [dashboards]
-# A setting of 20 (default) means only the last 20 versions will be stored and older versions removed.
-# To keep all dashboard versions you can set this value to 2147483647.
+# Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
 versions_to_keep = 20
 
 #################################### Users ###############################
diff --git a/conf/sample.ini b/conf/sample.ini
index 51451039e0a..85e74451fef 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -177,8 +177,7 @@ log_queries =
 
 #################################### Dashboards History ##################
 [dashboards]
-# A setting of 20 (default) means only the last 20 versions will be stored and older versions removed.
-# To keep all dashboard versions you can set this value to 2147483647.
+# Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
 ;versions_to_keep = 20
 
 #################################### Users ###############################
diff --git a/pkg/services/cleanup/cleanup.go b/pkg/services/cleanup/cleanup.go
index 1b85a1819e0..6e5e7684100 100644
--- a/pkg/services/cleanup/cleanup.go
+++ b/pkg/services/cleanup/cleanup.go
@@ -39,7 +39,7 @@ func (service *CleanUpService) Run(ctx context.Context) error {
 func (service *CleanUpService) start(ctx context.Context) error {
 	service.cleanUpTmpFiles()
 
-	ticker := time.NewTicker(time.Hour * 1)
+	ticker := time.NewTicker(time.Minute * 10)
 	for {
 		select {
 		case <-ticker.C:
diff --git a/pkg/services/sqlstore/dashboard_version.go b/pkg/services/sqlstore/dashboard_version.go
index 0b84e23006e..484a7e281dc 100644
--- a/pkg/services/sqlstore/dashboard_version.go
+++ b/pkg/services/sqlstore/dashboard_version.go
@@ -1,7 +1,6 @@
 package sqlstore
 
 import (
-	"math"
 	"strings"
 
 	"github.com/grafana/grafana/pkg/bus"
@@ -66,37 +65,39 @@ func GetDashboardVersions(query *m.GetDashboardVersionsQuery) error {
 
 func DeleteExpiredVersions(cmd *m.DeleteExpiredVersionsCommand) error {
 	return inTransaction(func(sess *DBSession) error {
-		var expiredCount int64 = 0
-		var versions []DashboardVersionExp
+		expiredCount := int64(0)
+		versions := []DashboardVersionExp{}
+		versionsToKeep := setting.DashboardVersionsToKeep
 
-		// Don't clean up if user set versions_to_keep to 2147483647 (MaxInt32)
-		if versionsToKeep := setting.DashboardVersionsToKeep; versionsToKeep < math.MaxInt32 {
-			err := sess.Table("dashboard_version").
-				Select("dashboard_version.id, dashboard_version.version, dashboard_version.dashboard_id").
-				Where(`dashboard_id IN (
-					SELECT dashboard_id FROM dashboard_version
-					GROUP BY dashboard_id HAVING COUNT(dashboard_version.id) > ?
-				)`, versionsToKeep).
-				Desc("dashboard_version.dashboard_id", "dashboard_version.version").
-				Find(&versions)
+		if versionsToKeep < 1 {
+			versionsToKeep = 1
+		}
 
+		err := sess.Table("dashboard_version").
+			Select("dashboard_version.id, dashboard_version.version, dashboard_version.dashboard_id").
+			Where(`dashboard_id IN (
+			SELECT dashboard_id FROM dashboard_version
+			GROUP BY dashboard_id HAVING COUNT(dashboard_version.id) > ?
+		)`, versionsToKeep).
+			Desc("dashboard_version.dashboard_id", "dashboard_version.version").
+			Find(&versions)
+
+		if err != nil {
+			return err
+		}
+
+		// Keep last versionsToKeep versions and delete other
+		versionIdsToDelete := getVersionIDsToDelete(versions, versionsToKeep)
+		if len(versionIdsToDelete) > 0 {
+			deleteExpiredSql := `DELETE FROM dashboard_version WHERE id IN (?` + strings.Repeat(",?", len(versionIdsToDelete)-1) + `)`
+			expiredResponse, err := sess.Exec(deleteExpiredSql, versionIdsToDelete...)
 			if err != nil {
 				return err
 			}
-
-			// Keep last versionsToKeep versions and delete other
-			versionIdsToDelete := getVersionIDsToDelete(versions, versionsToKeep)
-			if len(versionIdsToDelete) > 0 {
-				deleteExpiredSql := `DELETE FROM dashboard_version WHERE id IN (?` + strings.Repeat(",?", len(versionIdsToDelete)-1) + `)`
-				expiredResponse, err := sess.Exec(deleteExpiredSql, versionIdsToDelete...)
-				if err != nil {
-					return err
-				}
-				expiredCount, _ = expiredResponse.RowsAffected()
-			}
+			expiredCount, _ = expiredResponse.RowsAffected()
+			sqlog.Debug("Deleted old/expired dashboard versions", "expired", expiredCount)
 		}
 
-		sqlog.Debug("Deleted old/expired dashboard versions", "expired", expiredCount)
 		return nil
 	})
 }