diff --git a/conf/defaults.ini b/conf/defaults.ini
index 50548cc628d..6fc4cf2e4de 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -116,8 +116,8 @@ cookie_name = grafana_session
 # How many days an session can be unused before we inactivate it
 login_remember_days = 7
 
-# How often should the login token be rotated. default to '30m'
-rotate_token_minutes = 30
+# How often should the login token be rotated. default to '10m'
+rotate_token_minutes = 10
 
 # How long should Grafana keep expired tokens before deleting them
 delete_expired_token_after_days = 30
diff --git a/conf/sample.ini b/conf/sample.ini
index eae6560bc64..0f1c02dc231 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -112,8 +112,8 @@ log_queries =
 # How many days an session can be unused before we inactivate it
 ;login_remember_days = 7
 
-# How often should the login token be rotated. default to '30'
-;rotate_token_minutes = 30
+# How often should the login token be rotated. default to '10'
+;rotate_token_minutes = 10
 
 # How long should Grafana keep expired tokens before deleting them
 ;delete_expired_token_after_days = 30
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index cc7e538b1d4..660a00ba41d 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -556,7 +556,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
 	cfg.LoginCookieName = login.Key("cookie_name").MustString("grafana_session")
 	cfg.LoginCookieMaxDays = login.Key("login_remember_days").MustInt(7)
 	cfg.LoginDeleteExpiredTokensAfterDays = login.Key("delete_expired_token_after_days").MustInt(30)
-	cfg.LoginCookieRotation = login.Key("rotate_token_minutes").MustInt(30)
+	cfg.LoginCookieRotation = login.Key("rotate_token_minutes").MustInt(10)
 	if cfg.LoginCookieRotation < 2 {
 		cfg.LoginCookieRotation = 2
 	}