diff --git a/composer.json b/composer.json
index d4a5ffe9..c9a4e259 100644
--- a/composer.json
+++ b/composer.json
@@ -18,6 +18,7 @@
         "php": "^8.2",
         "ext-json": "*",
         "illuminate/support": "^10.1|^11.0",
+        "laravel/tinker": "^2.0",
         "facade/ignition-contracts": "^1.0.2",
         "spatie/ignition": "^1.4",
         "ramsey/uuid": "^4.7.3",
diff --git a/src/Commands/Tinker.php b/src/Commands/Tinker.php
new file mode 100644
index 00000000..851dd8d9
--- /dev/null
+++ b/src/Commands/Tinker.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Stancl\Tenancy\Commands;
+
+use Laravel\Tinker\Console\TinkerCommand as BaseTinker;
+use Symfony\Component\Console\Input\InputArgument;
+
+class Tinker extends BaseTinker
+{
+    public $name = 'tenant:tinker';
+
+    protected function getArguments()
+    {
+        return array_merge([
+            ['tenant', InputArgument::OPTIONAL, 'The tenant to run Tinker for. Pass the tenant key or leave null to default to the first tenant.'],
+        ], parent::getArguments());
+    }
+
+    public function handle()
+    {
+        // ?: to support empty strings so that the original argument (`include`) can be reached even with a falsy tenant argument
+        tenancy()->initialize($this->argument('tenant') ?: tenancy()->model()::first());
+
+        parent::handle();
+    }
+}
diff --git a/src/Concerns/HasATenantArgument.php b/src/Concerns/HasATenantArgument.php
deleted file mode 100644
index 5b374ff8..00000000
--- a/src/Concerns/HasATenantArgument.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Stancl\Tenancy\Concerns;
-
-use Symfony\Component\Console\Input\InputArgument;
-
-trait HasATenantArgument
-{
-    protected function getArguments()
-    {
-        return array_merge([
-            ['tenant', InputArgument::REQUIRED, 'Tenant id', null],
-        ], parent::getArguments());
-    }
-
-    protected function getTenants(): array
-    {
-        return [tenancy()->find($this->argument('tenant'))];
-    }
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->specifyParameters();
-    }
-}
diff --git a/src/TenancyServiceProvider.php b/src/TenancyServiceProvider.php
index 6b37c791..6f68a715 100644
--- a/src/TenancyServiceProvider.php
+++ b/src/TenancyServiceProvider.php
@@ -85,6 +85,7 @@ class TenancyServiceProvider extends ServiceProvider
             Commands\Down::class,
             Commands\Link::class,
             Commands\Seed::class,
+            Commands\Tinker::class,
             Commands\Install::class,
             Commands\Migrate::class,
             Commands\Rollback::class,