diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 1322f267..93288ef9 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -32,8 +32,9 @@ class Kernel extends ConsoleKernel
         $schedule->command('hr:update_status')->everyMinute()->withoutOverlapping();
         $schedule->command('hr:update_status --ignore_time=1')->hourly()->withoutOverlapping();
         $schedule->command('user:delete_expired_token')->dailyAt('04:00');
-        $schedule->command('claim:settle')->hourly()->between("00:00", "12:00")
-            ->when(function () {return Carbon::now()->format('d') == '01';})->withoutOverlapping();
+        $schedule->command('claim:settle')->hourly()->when(function () {
+            return Carbon::now()->format('d') == '01';
+        })->withoutOverlapping();
     }
 
     /**
diff --git a/app/Repositories/ClaimRepository.php b/app/Repositories/ClaimRepository.php
index a59ccffa..b19aaf43 100644
--- a/app/Repositories/ClaimRepository.php
+++ b/app/Repositories/ClaimRepository.php
@@ -7,6 +7,7 @@ use App\Models\Snatch;
 use App\Models\Torrent;
 use App\Models\User;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\DB;
 use Nexus\Database\NexusDB;
 
@@ -106,7 +107,9 @@ class ClaimRepository extends BaseRepository
         $startOfThisMonth = Carbon::now()->startOfMonth();
         $query = Claim::query()
             ->select(['uid'])
-            ->where('last_settle_at', '<', $startOfThisMonth)
+            ->where(function (Builder $query) use ($startOfThisMonth) {
+                $query->where('last_settle_at', '<', $startOfThisMonth)->orWhereNull('last_settle_at');
+            })
             ->groupBy('uid')
         ;
         $size = 10000;