diff --git a/config/schema/simple_oauth.schema.yml b/config/schema/simple_oauth.schema.yml
index b6244ae3fc010f6f1e23ee76a38e49c9b7c107d9..70b889cc55d4137d8ac4790a3f8081ec5fc52fab 100644
--- a/config/schema/simple_oauth.schema.yml
+++ b/config/schema/simple_oauth.schema.yml
@@ -107,7 +107,7 @@ simple_oauth.settings:
     token_cron_batch_size:
       type: integer
       label: 'Token batch size'
-      description: 'The number of expired token to delete per batch during cron cron'
+      description: 'The number of expired token to delete per batch during cron. Use 0 for no limit.'
     public_key:
       type: path
       label: 'Public Key'
diff --git a/simple_oauth.module b/simple_oauth.module
index ebf714589b48ce942fca6608bd167f82e926fe47..f13e874bfe935df8b7a598070ac98c9e2682066b 100644
--- a/simple_oauth.module
+++ b/simple_oauth.module
@@ -25,12 +25,12 @@ function simple_oauth_cron() {
   $collector = \Drupal::service('simple_oauth.expired_collector');
   $config = \Drupal::config('simple_oauth.settings');
   $logger = \Drupal::logger('simple_oauth');
-  $token_cron_batch_size = $config->get('token_cron_batch_size');
+  $token_cron_batch_size = $config->get('token_cron_batch_size') ?? 0;
   // Deleting one batch of expired tokens.
   if (!empty($expired_tokens = $collector->collect($token_cron_batch_size))) {
     $collector->deleteMultipleTokens($expired_tokens);
-    $logger->notice('Deleted @limit expired tokens in cron.', [
-      '@limit' => $token_cron_batch_size,
+    $logger->notice('Deleted @count expired tokens in cron.', [
+      '@count' => count($expired_tokens),
     ]);
   }
 }
diff --git a/src/Form/Oauth2TokenSettingsForm.php b/src/Form/Oauth2TokenSettingsForm.php
index 2c5a41fd96a9d8cc7ffc61f433d1e6e7e607a924..3b42add2e457652e7ff8bd50a6bfc3260f6f80aa 100644
--- a/src/Form/Oauth2TokenSettingsForm.php
+++ b/src/Form/Oauth2TokenSettingsForm.php
@@ -113,7 +113,8 @@ class Oauth2TokenSettingsForm extends ConfigFormBase {
     $form['token_cron_batch_size'] = [
       '#type' => 'number',
       '#title' => $this->t('Token batch size.'),
-      '#description' => $this->t('The number of expired token to delete per batch during cron cron.'),
+      '#description' => $this->t('The number of expired token to delete per batch during cron. Use 0 for no limit.'),
+      '#required' => TRUE,
       '#config_target' => 'simple_oauth.settings:token_cron_batch_size',
     ];
     $form['public_key'] = [