diff --git a/config_default.go b/config_default.go
index 7df3cf696..54b9b860b 100644
--- a/config_default.go
+++ b/config_default.go
@@ -544,7 +544,7 @@ func (c *Config) GetDeviceVerificationURL(ctx context.Context) string {
 
 func (c *Config) GetDeviceAuthTokenPollingInterval(ctx context.Context) time.Duration {
 	if c.DeviceAuthTokenPollingInterval == 0 {
-		return time.Second * 10
+		return time.Second * 5
 	}
 	return c.DeviceAuthTokenPollingInterval
 }
diff --git a/handler/rfc8628/auth_handler_test.go b/handler/rfc8628/auth_handler_test.go
index 600fa56e7..ef59b97f1 100644
--- a/handler/rfc8628/auth_handler_test.go
+++ b/handler/rfc8628/auth_handler_test.go
@@ -24,7 +24,7 @@ func Test_HandleDeviceEndpointRequest(t *testing.T) {
 		Strategy: &hmacshaStrategy,
 		Config: &fosite.Config{
 			DeviceAndUserCodeLifespan:      time.Minute * 10,
-			DeviceAuthTokenPollingInterval: time.Second * 10,
+			DeviceAuthTokenPollingInterval: time.Second * 5,
 			DeviceVerificationURL:          "www.test.com",
 			AccessTokenLifespan:            time.Hour,
 			RefreshTokenLifespan:           time.Hour,