diff --git a/src/Client.php b/src/Client.php
index 57f2ae7d9..a04c91221 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -65,7 +65,7 @@ public static function boot()
         parent::boot();
 
         static::creating(function ($model) {
-            if (config('passport.client_uuids')) {
+            if (Passport::clientUuids()) {
                 $model->{$model->getKeyName()} = $model->{$model->getKeyName()} ?: (string) Str::orderedUuid();
             }
         });
diff --git a/src/PassportServiceProvider.php b/src/PassportServiceProvider.php
index 99e345e17..618f903cd 100644
--- a/src/PassportServiceProvider.php
+++ b/src/PassportServiceProvider.php
@@ -81,7 +81,7 @@ protected function registerResources()
      */
     protected function registerMigrations()
     {
-        if ($this->app->runningInConsole() && Passport::$runsMigrations && ! config('passport.client_uuids')) {
+        if ($this->app->runningInConsole() && Passport::$runsMigrations && ! Passport::clientUuids()) {
             $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
         }
     }